fixed composer.lock
This commit is contained in:
parent
5d93b34def
commit
d6f291fa3c
|
@ -14211,21 +14211,12 @@
|
|||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/bovigo/vfsStream.git",
|
||||
<<<<<<< HEAD
|
||||
"reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/bovigo/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
|
||||
"reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
|
||||
=======
|
||||
"reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/bovigo/vfsStream/zipball/095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
|
||||
"reference": "095238a0711c974ae5b4ebf4c4534a23f3f6c99d",
|
||||
>>>>>>> master
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
Loading…
Reference in New Issue