Merge branch '2.1'

ezpublishlegacy · Apr 5, 2018 · 05707d4 · 05707d4
2 parents 3195d5e + 5f7876b
commit 05707d4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -63,6 +63,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",