fix bad merge

nicolas-grekas · nicolas-grekas · commit 09272ff0f77f · 2017-08-07T20:31:05.000+02:00
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -17,11 +17,11 @@
     ],
     "require": {
         "php": "^5.5.9|>=7.0.8",
-        "symfony/config": "~3.2",
-        "symfony/twig-bridge": "^3.3",
-        "symfony/http-foundation": "~2.8|~3.0",
-        "symfony/http-kernel": "^3.3",
-        "twig/twig": "~1.34|~2.4"
+        "symfony/config": "~3.2|~4.0",
+        "symfony/twig-bridge": "^3.3|~4.0",
+        "symfony/http-foundation": "~2.8|~3.0|~4.0",
+        "symfony/http-kernel": "^3.3|~4.0",
+        "twig/twig": "~1.34|~2.4|~4.0"
     },
     "require-dev": {
         "symfony/asset": "~2.8|~3.0|~4.0",
