chore: remove conflict

tinect · tinect · commit 3d0d80ead98b · 2025-08-27T20:12:40.000+02:00
diff --git a/composer.json b/composer.json
@@ -44,9 +44,5 @@
             "Frosh\\FroshProductCompare\\": "src/"
         }
     },
-    "conflict": {
-        "shopware/storefront": "<6,>=7",
-        "shopware/administration": "<6,>=7"
-    },
     "prefer-stable": true
 }

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,5 @@`
`44`	`44`	`"Frosh\\FroshProductCompare\\": "src/"`
`45`	`45`	`}`
`46`	`46`	`},`
`47`		`- "conflict": {`
`48`		`- "shopware/storefront": "<6,>=7",`
`49`		`- "shopware/administration": "<6,>=7"`
`50`		`- },`
`51`	`47`	`"prefer-stable": true`
`52`	`48`	`}`