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 · 9f9f143 · 9f9f143
2 parents aa4abec + e3f6d9c
commit 9f9f143
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -38,6 +38,9 @@
         "incenteev/composer-parameter-handler": "~2.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0"
     },
+    "conflict": {
+        "twig/twig": "^1.0"
+    },
     "config": {
         "bin-dir": "bin"
     },