fix laravel conflict bug

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

3
.gitignore vendored
View File

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