Merge pull request #825 from nelmio/conflict

Mark symfony ^2.7.7 as conflict
2025-02-09 02:59:27 +03:00 · 2016-03-21 11:30:06 +01:00 · 2016-03-21 11:30:06 +01:00 · 476348de54
commit 476348de54
parent 2a0f95eac0 4986e02ec1
1 changed files with 2 additions and 1 deletions
--- 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",