Merge branch '2.1' into demo-ee_2.1

ezecosystem · Apr 6, 2018 · 2f47a63 · 2f47a63
2 parents c71abfb + f7499e0
commit 2f47a63
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -89,6 +89,10 @@
         "sensio/generator-bundle": "~3.1",
         "symfony/phpunit-bridge": "~3.2"
     },
+    "conflict": {
+        "symfony/symfony": "3.4.7",
+        "doctrine/dbal": "2.7.0"
+    },
     "scripts": {
         "symfony-scripts": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",