From 916f6ab5869943f37ec994a1df26a65344c5293b Mon Sep 17 00:00:00 2001
From: Mateusz Deszert-Klosowski <mateusz.deszert-klosowski@bitbag.pl>
Date: Thu, 15 Feb 2024 08:55:25 +0100
Subject: [PATCH] Removed conflict from composer.json

---
 composer.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 1272c86d..65d4a674 100644
--- 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": {