Merge pull request #825 from nelmio/conflict

Mark symfony ^2.7.7 as conflict
nelmio · Mar 21, 2016 · 476348d · 476348d
2 parents 2a0f95e + 4986e02
commit 476348d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,8 @@
     "conflict": {
         "jms/serializer": "<0.12",
         "jms/serializer-bundle": "<0.11",
-        "twig/twig": "<1.12"
+        "twig/twig": "<1.12",
+        "symfony/symfony": "~2.7.8"
     },
     "require-dev": {
         "symfony/css-selector": "~2.3|~3.0",