zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

resolve conflict

Browse Source
This commit is contained in:
Pig Fang 2019-02-27 23:50:37 +08:00
parent 893fda4abe
commit e380d82962
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -23,11 +23,7 @@
"laravel/browser-kit-testing": "~4.0",
"league/flysystem-memory": "^1.0",
"mikey179/vfsstream": "^1.6.5",
<<<<<<< HEAD
"barryvdh/laravel-ide-helper": "^2.6"
=======
"barryvdh/laravel-ide-helper": "^2.4"
>>>>>>> fix package name
},
"autoload": {
"classmap": [