XiaoMo/QueryList
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix laravel conflict bug

Browse Source
This commit is contained in:
Jaeger 2017-11-15 10:43:28 +08:00
parent 31ec950cdc
commit 9d04003d73
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/vendor/ /vendor/
.idea/ .idea/
composer.lock composer.lock
.DS_Store

2
composer.json
View File

@ -6,7 +6,7 @@
"require": { "require": {
"PHP":">=7.0", "PHP":">=7.0",
"jaeger/phpquery-single": "^0.9", "jaeger/phpquery-single": "^0.9",
"tightenco/collect": "^5.5", "tightenco/collect": "^5.*",
"jaeger/g-http": "^1.1" "jaeger/g-http": "^1.1"
}, },
"suggest":{ "suggest":{