Skip to content

Commit 2bc29f5

Browse files
committed
move conflict rule to require
1 parent 79a7d9d commit 2bc29f5

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"php": ">=5.6.0",
1616
"symfony/framework-bundle": "^3.2|^4",
1717
"symfony/console": "^3.2|^4",
18+
"symfony/dependency-injection": "^3.3|^4",
1819
"symfony/options-resolver" : "^3.2|^4",
1920
"symfony/property-access": "^3.2|^4",
2021
"pagerfanta/pagerfanta": "^1.0.5",
@@ -36,9 +37,6 @@
3637
"symfony/yaml": "^3.2|^4",
3738
"friendsofphp/php-cs-fixer": "^2.2"
3839
},
39-
"conflict": {
40-
"symfony/dependency-injection": "<3.3"
41-
},
4240
"suggest": {
4341
"enqueue/elastica-bundle": "The bundle adds extra features to FOSElasticaBundle bundle. Aimed to improve performance."
4442
},

0 commit comments

Comments
 (0)