From 4933185f7bafe24a7f9316b47126542d3c04c403 Mon Sep 17 00:00:00 2001
From: marco76tv <marco.sottana@gmail.com>
Date: Tue, 9 Jan 2024 09:39:09 +0100
Subject: [PATCH] up

---
 .gitignore                       | 3 ---
 Config/config.php                | 3 ---
 View/Components/_components.json | 4 ----
 composer.json                    | 3 ---
 4 files changed, 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index dbaaa7ae..329b6a7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,10 +18,7 @@ package-lock.json
 .php-cs-fixer.cache
 package-lock.json
 .git-rewrite/
-<<<<<<< HEAD
 *.phar
 .git-rewrite/
 .php-cs-fixer.cache
 
-=======
->>>>>>> dev
diff --git a/Config/config.php b/Config/config.php
index 25bd0580..d120fa79 100644
--- a/Config/config.php
+++ b/Config/config.php
@@ -4,8 +4,5 @@
 
 return [
     'name' => 'UI',
-<<<<<<< HEAD
     'navigation_sort' => 1,
-=======
->>>>>>> dev
 ];
diff --git a/View/Components/_components.json b/View/Components/_components.json
index 76251894..93b9547e 100644
--- a/View/Components/_components.json
+++ b/View/Components/_components.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
 [{"class_name":"BreadLink","comp_name":"bread-link","comp_ns":"Modules\\UI\\View\\Components\\BreadLink"},{"class_name":"Navbar","comp_name":"navbar","comp_ns":"Modules\\UI\\View\\Components\\Navbar"},{"class_name":"Render\\Block","comp_name":"render.block","comp_ns":"Modules\\UI\\View\\Components\\Render\\Block"},{"class_name":"Render\\Blocks","comp_name":"render.blocks","comp_ns":"Modules\\UI\\View\\Components\\Render\\Blocks"},{"class_name":"Std","comp_name":"std","comp_ns":"Modules\\UI\\View\\Components\\Std"},{"class_name":"Svg","comp_name":"svg","comp_ns":"Modules\\UI\\View\\Components\\Svg"}]
-=======
-[]
->>>>>>> dev
diff --git a/composer.json b/composer.json
index cb3217e4..2c98aa74 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,8 @@
 {
     "name": "laraxot/module_ui_fila3",
     "description": "",
-<<<<<<< HEAD
     "homepage": "https://github.com/laraxot/module_ui_fila3.git",
     "license": "MIT",
-=======
->>>>>>> dev
     "authors": [{
         "name": "Marco Sottana",
         "email": "marco.sottana@gmail.com"