RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-13 13:09:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #825 from nelmio/conflict

Browse Source 
Mark symfony ^2.7.7 as conflict
This commit is contained in:
William Durand 2016-03-21 11:30:06 +01:00
commit 476348de54
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -24,7 +24,8 @@
"conflict": { "conflict": {
"jms/serializer": "<0.12", "jms/serializer": "<0.12",
"jms/serializer-bundle": "<0.11", "jms/serializer-bundle": "<0.11",
"twig/twig": "<1.12" "twig/twig": "<1.12",
"symfony/symfony": "~2.7.8"
}, },
"require-dev": { "require-dev": {
"symfony/css-selector": "~2.3|~3.0", "symfony/css-selector": "~2.3|~3.0",