Merge branch '6.0' into 6

silverstripe · Jan 14, 2025 · 1d94723 · 1d94723
2 parents 1db59f7 + 6a76694
commit 1d94723
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -36,6 +36,9 @@
         "silverstripe/standards": "^1",
         "phpstan/extension-installer": "^1.3"
     },
+    "conflict": {
+        "symbiote/silverstripe-queuedjobs": "6.0.0-alpha1"
+    },
     "extra": {
         "expose": [
             "client/dist"