Merge pull request #241 from BitBagCommerce/fix/doctrine

Removed conflict from composer.json

Author: senghe

composer.json

@@ -11,7 +11,7 @@
     },
     "require-dev": {
         "behat/behat": "^3.7",
-        "behat/mink-selenium2-driver": "^1.4",
+        "behat/mink-selenium2-driver": "~1.6.0",
         "bitbag/coding-standard": "^1.0.1",
         "dmore/behat-chrome-extension": "^1.3",
         "dmore/chrome-mink-driver": "^2.7",
@@ -38,7 +38,6 @@
         "sylius/mailer-bundle":  "^1.8 || ^2.0@beta"
     },
     "conflict": {
-        "doctrine/orm": ">=2.15.2",
         "symfony/symfony": "4.1.8",
         "symfony/browser-kit": "4.1.8",
         "symfony/dom-crawler": "4.1.8",