Revert "add conflict for alpha & beta"

This reverts commit 097956a.
pimcore · Apr 24, 2023 · b64a1c5 · b64a1c5
1 parent 097956a
commit b64a1c5
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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 @@
       ]
     }
   }
-},
+}