Merge pull request Sylius#9136 from pamil/1.0-conflict-with-twig10

Make packages providing Twig extensions conflict with Twig 1.x
pamil · Feb 1, 2018 · f668048 · f668048
2 parents 35609a8 + 3dad2a7
commit f668048
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -37,6 +37,9 @@
         "symfony/dependency-injection": "^3.2",
         "symfony/twig-bundle": "^3.2"
     },
+    "conflict": {
+        "twig/twig": "^1.0"
+    },
     "config": {
         "bin-dir": "bin"
     },