fix docker-compose conflict
This commit is contained in:
parent
00934a3d3e
commit
2d6ba7c861
18
composer.lock
generated
18
composer.lock
generated
|
@ -3510,12 +3510,12 @@
|
|||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||
"reference": "ad069801f3d0cdb7102e58afd5f9f32834ec7160"
|
||||
"reference": "f6293e1b30a2354e8428e004689671b83871edde"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ad069801f3d0cdb7102e58afd5f9f32834ec7160",
|
||||
"reference": "ad069801f3d0cdb7102e58afd5f9f32834ec7160",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f6293e1b30a2354e8428e004689671b83871edde",
|
||||
"reference": "f6293e1b30a2354e8428e004689671b83871edde",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -3571,7 +3571,7 @@
|
|||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
|
||||
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2"
|
||||
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
@ -3579,7 +3579,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2021-02-08T09:55:27+00:00"
|
||||
"time": "2021-03-28T07:26:59+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-file-iterator",
|
||||
|
@ -4997,12 +4997,12 @@
|
|||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "5da8b675121f9f4419b7052caa0cc6118a3ccd47"
|
||||
"reference": "fb7e2447d39984358343685fb9f0e800cd79e6a3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/5da8b675121f9f4419b7052caa0cc6118a3ccd47",
|
||||
"reference": "5da8b675121f9f4419b7052caa0cc6118a3ccd47",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/fb7e2447d39984358343685fb9f0e800cd79e6a3",
|
||||
"reference": "fb7e2447d39984358343685fb9f0e800cd79e6a3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@ -5088,7 +5088,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-03-23T14:20:07+00:00"
|
||||
"time": "2021-03-28T09:44:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/deprecation-contracts",
|
||||
|
|
Loading…
Reference in a new issue