fix laravel conflict bug

2017-11-15 10:43:28 +08:00
parent 31ec950cdc
commit 9d04003d73
2 changed files with 3 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /vendor/
 .idea/
-composer.lock
+composer.lock
+.DS_Store
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
    "require": {
        "PHP":">=7.0",
        "jaeger/phpquery-single": "^0.9",
-        "tightenco/collect": "^5.5",
+        "tightenco/collect": "^5.*",
        "jaeger/g-http": "^1.1"
    },
    "suggest":{