update categories.st

pharo-project · Jul 19, 2018 · a90530a · a90530a
1 parent d695b93
commit a90530a
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/PharoLauncher-Core.package/monticello.meta/categories.st b/src/PharoLauncher-Core.package/monticello.meta/categories.st
@@ -1,10 +1,5 @@
 SystemOrganization addCategory: #'PharoLauncher-Core'!
 SystemOrganization addCategory: 'PharoLauncher-Core-Commands'!
 SystemOrganization addCategory: 'PharoLauncher-Core-Model'!
-<<<<<<< HEAD
 SystemOrganization addCategory: #'PharoLauncher-Core-Settings'!
 SystemOrganization addCategory: 'PharoLauncher-Core-Settings'!
-gs'!
-=======
-SystemOrganization addCategory: 'PharoLauncher-Core-Settings'!
->>>>>>> dcc81a33423fba9dd560ad56da69c7b240824d02