Merge branch '7.0' into 7

silverstripe · Jan 14, 2025 · 16363d0 · 16363d0
2 parents 45f3558 + 51ade65
commit 16363d0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -30,6 +30,9 @@
         "silverstripe/standards": "^1",
         "phpstan/extension-installer": "^1.3"
     },
+    "conflict": {
+        "symbiote/silverstripe-queuedjobs": "6.0.0-alpha1"
+    },
     "autoload": {
         "psr-4": {
             "SilverStripe\\StaticPublishQueue\\": "src/",