Skip to content

Commit

Permalink
Mirror conflict section
Browse files Browse the repository at this point in the history
  • Loading branch information
4c0n authored May 19, 2020
1 parent b6bbdac commit b7d1bc5
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
"symfony/web-server-bundle": "^4.4",
"squizlabs/php_codesniffer": "^3.5"
},
"conflict": {
"doctrine/inflector": "^1.4",
"sylius/grid-bundle": "1.7.4",
"symfony/symfony": "3.4.7",
"twig/twig": "2.6.1",
"api-platform/core": "2.5.5"
},
"prefer-stable": true,
"autoload": {
"psr-4": {
Expand Down

0 comments on commit b7d1bc5

Please sign in to comment.