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 · 3757d54 · 3757d54
2 parents 500013f + 30718f9
commit 3757d54
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -49,6 +49,9 @@
         "symfony/validator": "^3.2",
         "twig/twig": "^2.0"
     },
+    "conflict": {
+        "twig/twig": "^1.0"
+    },
     "config": {
         "bin-dir": "bin"
     },