Fix composer.json

netzmacht · Jan 9, 2024 · fe8ef76 · fe8ef76
1 parent 7852ee4
commit fe8ef76
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -68,12 +68,8 @@
       "contao/manager-plugin": true,
       "dealerdirect/phpcodesniffer-composer-installer": true,
       "php-http/discovery": true
-<<<<<<< HEAD
-    }
-=======
     },
     "sort-packages": true
->>>>>>> 4.0.0
   },
   "extra": {
     "branch-alias": {