Skip to content

Commit fcf541e

Browse files
Merge pull request #23 from magento/MAGECLOUD-5127
Remove conflict from composer.json
2 parents 9e1b12f + 3a85f8d commit fcf541e

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
"symfony/dependency-injection": "^3.3||^4.3",
1515
"symfony/process": "^2.1||^4.1"
1616
},
17-
"conflict": {
18-
"symfony/process": "^4.2"
19-
},
2017
"require-dev": {
2118
"phpmd/phpmd": "@stable",
2219
"phpunit/phpunit": "^6.2",

0 commit comments

Comments
 (0)