mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 17:10:53 +00:00
[Fix] Remove redundant conflict entries
This commit is contained in:
parent
0fe3bcd42b
commit
e39ccd1ffc
2 changed files with 0 additions and 6 deletions
|
|
@ -45,9 +45,6 @@
|
|||
"conflict": {
|
||||
"doctrine/orm": "2.15.2"
|
||||
},
|
||||
"conflict": {
|
||||
"doctrine/orm": "2.15.2"
|
||||
},
|
||||
"config": {
|
||||
"allow-plugins": {
|
||||
"symfony/flex": true
|
||||
|
|
|
|||
|
|
@ -47,9 +47,6 @@
|
|||
"conflict": {
|
||||
"doctrine/orm": "2.15.2"
|
||||
},
|
||||
"conflict": {
|
||||
"doctrine/orm": "2.15.2"
|
||||
},
|
||||
"config": {
|
||||
"allow-plugins": {
|
||||
"symfony/flex": true
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue