Merge pull request #216 from mbabker/patch-1

Expand Twig version conflict
sampart · Nov 21, 2019 · 5421d5e · 5421d5e
2 parents f492615 + ef9b1a9
commit 5421d5e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "phpunit/phpunit": "~3.7|~4.0|^5.0"
     },
     "conflict": {
-        "twig/twig": "<1.34"
+        "twig/twig": "<1.34|>=2.0,<2.4"
     },
     "autoload": {
         "psr-4": {