Merge pull request #53 from BitBagCommerce/removing-conflicts

removing unnecessary conflicts from composer json
BitBagCommerce · Aug 11, 2024 · 6faef18 · 6faef18
2 parents 1bf2464 + 455fffd
commit 6faef18
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     },
     "require-dev": {
         "behat/behat": "^3.6.1",
-        "behat/mink-selenium2-driver": "^1.4",
+        "behat/mink-selenium2-driver": "~1.6.0",
         "bitbag/coding-standard": "^3.0",
         "dmore/behat-chrome-extension": "^1.3",
         "dmore/chrome-mink-driver": "^2.7",
@@ -43,10 +43,6 @@
         "symfony/webpack-encore-bundle": "^1.14",
         "doctrine/persistence": "^3.0"
     },
-    "conflict": {
-        "behat/mink-selenium2-driver": ">=1.7.0",
-        "doctrine/annotations": ">1.15"
-    },
     "config": {
         "sort-packages": true,
         "allow-plugins": {