From 26edc1d6f7d6d9ce31f2b36cfcced4a1fa68067a Mon Sep 17 00:00:00 2001 From: JiaJia Ji Date: Tue, 16 May 2023 15:03:36 +0200 Subject: [PATCH] [Task]: Pre-Release TODO (#25) * task: pre release change * readd stability dev --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 3c2498a..1de1b56 100644 --- a/composer.json +++ b/composer.json @@ -16,10 +16,6 @@ "pimcore/pimcore": "^11.0", "pimcore/admin-ui-classic-bundle": "^1.0" }, - "conflict": { - "pimcore/pimcore": "v11.0.0-ALPHA1 || v11.0.0-ALPHA2 || v11.0.0-ALPHA3 || v11.0.0-ALPHA4 || v11.0.0-ALPHA5 || v11.0.0-ALPHA6 || v11.0.0-ALPHA7 || v11.0.0-ALPHA8 || v11.0.0-BETA1", - "pimcore/admin-ui-classic-bundle": "v1.0.0-BETA1" - }, "require-dev": { "phpstan/phpstan": "^1.10.5", "phpstan/phpstan-symfony": "^1.2.20",