From 334d029d0284c6ac28b13f85852b0ed9b666d97a Mon Sep 17 00:00:00 2001
From: Tomas Ludvik <tomas.ludvik@shopsys.com>
Date: Wed, 27 Mar 2024 09:14:15 +0100
Subject: [PATCH] [shopsys] unified composer conflicts (#3082)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a3937ed0b..00762953f 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "php-parallel-lint/php-parallel-lint": "^1.3.1"
     },
     "conflict": {
-        "symfony/dependency-injection": "3.4.15|3.4.16"
+        "symfony/dependency-injection": "3.4.15 || 3.4.16"
     },
     "config": {
         "allow-plugins": {