修改文件冲突

composer.json

@@ -19,8 +19,7 @@
         "tymon/jwt-auth": "dev-develop",
         "xethron/migrations-generator": "^2.0",
         "yansongda/laravel-pay": "^2.0",
-        "zgldh/qiniu-laravel-storage": "^0.9.2",
-        "predis/predis":"1.1.1"
+        "zgldh/qiniu-laravel-storage": "^0.9.2"
     },
     "require-dev": {
         "filp/whoops": "~2.0",