Merge pull request #235 from BitBagCommerce/fix/doctrine

Removed conflict from composer.json
BitBagCommerce · Feb 18, 2024 · 1bd3fcb · 1bd3fcb
2 parents c24805e + 916f6ab
commit 1bd3fcb
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     },
     "require-dev": {
         "behat/behat": "^3.7",
-        "behat/mink-selenium2-driver": "^1.4",
+        "behat/mink-selenium2-driver": "~1.6.0",
         "dmore/behat-chrome-extension": "^1.3",
         "dmore/chrome-mink-driver": "^2.7",
         "friends-of-behat/mink": "^1.8",
@@ -48,8 +48,7 @@
         "twig/extra-bundle": "^3.4"
     },
     "conflict": {
-        "symfony/form": "4.4.11 || 4.4.12",
-        "doctrine/orm": ">=2.15.2"
+        "symfony/form": "4.4.11 || 4.4.12"
     },
     "autoload": {
         "psr-4": {