From b64a1c5096dd9755abfaaaec1bf479004cc4f4ac Mon Sep 17 00:00:00 2001
From: Divesh Pahuja <divesh.pahuja@pimcore.com>
Date: Mon, 24 Apr 2023 16:21:34 +0200
Subject: [PATCH] Revert "add conflict for alpha & beta"

This reverts commit 097956a86563107a53a5ce45cbb950bf23bbb0ef.
---
 composer.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 989d4d6..ac7661b 100644
--- a/composer.json
+++ b/composer.json
@@ -16,9 +16,6 @@
     "symfony/templating": "^6.2",
     "pimcore/ecommerce-framework-bundle": "^1.0"
   },
-  "conflict": {
-    "pimcore/pimcore": "@alpha || @beta"
-  },
   "require-dev": {
     "phpstan/phpstan": "^1.10.5",
     "phpstan/phpstan-symfony": "^1.2.20"
@@ -40,4 +37,4 @@
       ]
     }
   }
-},
+}