Update composer.json

hackeresq · Feb 3, 2021 · 0815d9a · 0815d9a
1 parent fbdfe4c
commit 0815d9a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -17,11 +17,7 @@
     },
     "require": {
         "php" : ">=7.0",
-<<<<<<< Updated upstream
-        "laravel/framework": "~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0",
-=======
         "laravel/framework": "^6.0|^7.0|^8.0",
->>>>>>> Stashed changes
         "doctrine/dbal": "^2.8"
     },
     "require-dev": {