Glebaster/forum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor #5 Remove useless conflict (curry684)

Browse Source 
This PR was merged into the master branch.

Discussion
----------

Remove useless conflict

Not much use to depend on `symfony/framework-bundle:3.3.x-dev` and then declare a conflict with `<3.3`.

Commits
-------

6958a71 Remove useless conflict
This commit is contained in:
Fabien Potencier
2017-04-19 11:47:33 -06:00
parent 95d854e398 6958a717d3
commit e1c67b9402
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -44,7 +44,6 @@
}, },
"conflict": { "conflict": {
"symfony/symfony": "<3.3", "symfony/symfony": "<3.3",
"symfony/framework-bundle": "<3.3",
"symfony/twig-bundle": "<3.3", "symfony/twig-bundle": "<3.3",
"symfony/debug": "<3.3" "symfony/debug": "<3.3"
}, },