Merge pull request #98 from kgonella/feature/remove-conflict-in-composer-json

Remove the doctrine conflict in composer.json

Author: stefandoorn

composer.json

@@ -12,9 +12,6 @@
         "sylius/sylius": "~1.9.0 || ~1.10.0",
         "xynnn/google-tag-manager-bundle": "^3.0"
     },
-    "conflict": {
-        "doctrine/dbal": ">2.13"
-    },
     "require-dev": {
         "behat/behat": "^3.6.1",
         "behat/mink-selenium2-driver": "^1.4",