Fixed composer.json

renoki-co · Feb 28, 2019 · 1852ea0 · 1852ea0
1 parent 9cb2619
commit 1852ea0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -21,11 +21,7 @@
         }
     ],
     "require": {
-<<<<<<< HEAD
         "laravel/framework": "~5.5"
-=======
-        "laravel/framework": "~5.5.0|~5.6.0|~5.7.0"
->>>>>>> fa1bfa1eba9d95c3be3f9327c83524ae1c4ff25b
     },
     "require-dev": {
         "doctrine/dbal": "^2.8@dev",