Yaffs site version 1.1

[yaffs-website] / vendor / symfony / http-kernel / composer.json

diff --git a/vendor/symfony/http-kernel/composer.json b/vendor/symfony/http-kernel/composer.json
index 14a36bbd4a2838de79aa66f159aa8f7a5108b97f..ac8d3de849b8b4e1b07ae73c972989ba823b8d65 100644 (file)
--- 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": "",