X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fsymfony%2Fhttp-kernel%2Fcomposer.json;h=ac8d3de849b8b4e1b07ae73c972989ba823b8d65;hp=14a36bbd4a2838de79aa66f159aa8f7a5108b97f;hb=eba34333e3c89f208d2f72fa91351ad019a71583;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae

diff --git a/vendor/symfony/http-kernel/composer.json b/vendor/symfony/http-kernel/composer.json
index 14a36bbd4..ac8d3de84 100644
--- a/vendor/symfony/http-kernel/composer.json
+++ b/vendor/symfony/http-kernel/composer.json
@@ -40,7 +40,8 @@
         "symfony/var-dumper": "~2.6|~3.0.0"
     },
     "conflict": {
-        "symfony/config": "<2.7"
+        "symfony/config": "<2.7",
+        "twig/twig": "<1.34|<2.4,>=2"
     },
     "suggest": {
         "symfony/browser-kit": "",