Merge pull request #492 from BitBagCommerce/fix/doctrine

Removed conflict from composer.json

Author: senghe

composer.json

@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "behat/behat": "^3.7",
-        "behat/mink-selenium2-driver": "^1.4",
+        "behat/mink-selenium2-driver": "~1.6.0",
         "bitbag/coding-standard": "^2.0",
         "dmore/behat-chrome-extension": "^1.3",
         "dmore/chrome-mink-driver": "^2.7",
@@ -55,8 +55,7 @@
         "symfony/browser-kit": "4.1.8",
         "symfony/dom-crawler": "4.1.8",
         "symfony/routing": "4.1.8",
-        "symfony/doctrine-bridge": "4.4.16",
-        "doctrine/orm": ">=2.15.2"
+        "symfony/doctrine-bridge": "4.4.16"
     },
 
     "suggest": {