From e6367a2ae76ec8b5b64f464c3d3bb0d02ebd3ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Odwa=C5=BCny?= <christopherheroo@gmail.com>
Date: Wed, 7 Aug 2024 02:18:00 +0200
Subject: [PATCH] removing unnecessary conflicts from composer json

---
 composer.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 40f2ffb..c06b087 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,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",
@@ -42,10 +42,6 @@
     "symfony/webpack-encore-bundle": "^1.14",
     "doctrine/persistence": "^3.0"
   },
-  "conflict": {
-    "behat/mink-selenium2-driver": ">=1.7.0",
-    "doctrine/annotations": ">1.15"
-  },
   "prefer-stable": true,
   "autoload": {
     "psr-4": {