Skip to content

Commit

Permalink
Adapt conflict section
Browse files Browse the repository at this point in the history
  • Loading branch information
jordisala1991 authored and OskarStark committed Mar 12, 2018
1 parent b55e815 commit d6e12df
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@
"twig/twig": "^1.34 || ^2.0"
},
"conflict": {
"jms/di-extra-bundle": "<1.7.0",
"sonata-project/exporter": "1.6.0",
"sonata-project/media-bundle": "<3.7.0",
"sonata-project/user-bundle": "<3.3.0"
"jms/di-extra-bundle": "<1.9",
"sonata-project/media-bundle": "<3.7",
"sonata-project/user-bundle": "<3.3"
},
"require-dev": {
"jms/di-extra-bundle": "^1.9",
Expand Down

0 comments on commit d6e12df

Please sign in to comment.