Updated twig dependencies (#140)

DamienHarper · Dec 4, 2019 · e4e22a1 · e4e22a1
1 parent b6987c9
commit e4e22a1
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -17,6 +17,7 @@
     "symfony/event-dispatcher": "^3.4|^4.0|^5.0",
     "symfony/security-bundle": "^3.4|^4.0|^5.0",
     "symfony/translation": "^3.4|^4.0|^5.0",
+    "symfony/twig-bundle": "^3.4|^4.0|^5.0",
     "doctrine/annotations": "^1.8",
     "symfony/lock": "^3.4|^4.0|^5.0"
   },
@@ -43,9 +44,6 @@
     "phpstan/phpstan-symfony": "^0.11",
     "phpstan/phpstan-shim": "^0.11"
   },
-  "conflict": {
-    "twig/twig": "<1.40|<2.9"
-  },
   "scripts": {
     "test": "php -d pcov.enabled=1 ./vendor/bin/phpunit",
     "csfixer": "vendor/bin/php-cs-fixer fix --config=.php_cs --using-cache=no --verbose",