From 9d04003d738a739969e888c12b7c5191d88cd00e Mon Sep 17 00:00:00 2001
From: Jaeger <hj.q@qq.com>
Date: Wed, 15 Nov 2017 10:43:28 +0800
Subject: [PATCH] fix laravel conflict bug

---
 .gitignore    | 3 ++-
 composer.json | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6513212..11dc639 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /vendor/
 .idea/
-composer.lock
\ No newline at end of file
+composer.lock
+.DS_Store
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 7873672..399cb79 100644
--- 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":{