Update composer.json

giwrgos88 · Jan 31, 2017 · 0f73805 · 0f73805
1 parent 2ffa511
commit 0f73805
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -21,11 +21,7 @@
   "require": {
     "php": ">=7.0",
     "giwrgos88/core-game-platform": "~1.0",
-<<<<<<< HEAD
     "laravelcollective/html": "^5.4"
-=======
-    "laravelcollective/html": "^5.4",
->>>>>>> a72dfe4448acaec3ccd7684a422c43e49ac3c8ca
   },
   "require-dev": {
     "phpunit/phpunit": "~4.0",
@@ -44,4 +40,4 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true
-}
+}