去掉冲突

composer.lock

@@ -449,7 +449,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/c26463ff9241f27907112fbcd0c86fa670cfef98",
                 "reference": "c26463ff9241f27907112fbcd0c86fa670cfef98",
-<<<<<<< HEAD
                 "shasum": "",
                 "mirrors": [
                     {
@@ -457,9 +456,6 @@
                         "preferred": true
                     }
                 ]
-=======
-                "shasum": ""
->>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "doctrine/lexer": "^1.0.1",
@@ -1157,7 +1153,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/lcobucci/jwt/zipball/a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
                 "reference": "a11ec5f4b4d75d1fcd04e133dede4c317aac9e18",
-<<<<<<< HEAD
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1165,9 +1160,6 @@
                         "preferred": true
                     }
                 ]
-=======
-                "shasum": ""
->>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "ext-mbstring": "*",
@@ -1222,7 +1214,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c5a5097156387970e6f0ccfcdf03f752856f3391",
                 "reference": "c5a5097156387970e6f0ccfcdf03f752856f3391",
-<<<<<<< HEAD
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1230,9 +1221,6 @@
                         "preferred": true
                     }
                 ]
-=======
-                "shasum": ""
->>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "ext-fileinfo": "*",
@@ -1626,7 +1614,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
                 "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
-<<<<<<< HEAD
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1634,9 +1621,6 @@
                         "preferred": true
                     }
                 ]
-=======
-                "shasum": ""
->>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "ext-tokenizer": "*",
@@ -1791,7 +1775,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
                 "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
-<<<<<<< HEAD
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1799,9 +1782,6 @@
                         "preferred": true
                     }
                 ]
-=======
-                "shasum": ""
->>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "php": ">=5.3.9"
@@ -3811,7 +3791,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/13e8ddc7bac782d9f0458ed151e3690ac7ba44fd",
                 "reference": "13e8ddc7bac782d9f0458ed151e3690ac7ba44fd",
-<<<<<<< HEAD
                 "shasum": "",
                 "mirrors": [
                     {
@@ -3819,9 +3798,6 @@
                         "preferred": true
                     }
                 ]
-=======
-                "shasum": ""
->>>>>>> fda7c2d48b055ac204de8003ffacee6ebcbb8ec9
             },
             "require": {
                 "illuminate/auth": "^5.1",