Skip to content

Commit

Permalink
Removed conflict from composer.json
Browse files Browse the repository at this point in the history
  • Loading branch information
leszczuu committed Feb 15, 2024
1 parent c24805e commit 916f6ab
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"require-dev": {
"behat/behat": "^3.7",
"behat/mink-selenium2-driver": "^1.4",
"behat/mink-selenium2-driver": "~1.6.0",
"dmore/behat-chrome-extension": "^1.3",
"dmore/chrome-mink-driver": "^2.7",
"friends-of-behat/mink": "^1.8",
Expand Down Expand Up @@ -48,8 +48,7 @@
"twig/extra-bundle": "^3.4"
},
"conflict": {
"symfony/form": "4.4.11 || 4.4.12",
"doctrine/orm": ">=2.15.2"
"symfony/form": "4.4.11 || 4.4.12"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 916f6ab

Please sign in to comment.