up

.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

Config/config.php

@@ -4,8 +4,5 @@
 
 return [
     'name' => 'UI',
-<<<<<<< HEAD
     'navigation_sort' => 1,
-=======
->>>>>>> dev
 ];

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

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": "[email protected]"