From c2945145b9b369b272bffc895606e8b7c7a2a01c Mon Sep 17 00:00:00 2001 From: Mateusz Deszert-Klosowski Date: Thu, 15 Feb 2024 08:54:53 +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 51bb0670b..fa6f4021c 100755 --- a/composer.json +++ b/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": {