From c3f430261a3a023c664e74219f8a950a3c4eaf73 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <guy.sartorelli@gmail.com>
Date: Thu, 3 Oct 2024 10:56:37 +1300
Subject: [PATCH] MNT fix bad merge

---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index ad3395d..d09e642 100644
--- a/composer.json
+++ b/composer.json
@@ -4,11 +4,11 @@
     "description": "The SilverStripe Framework Installer",
     "require": {
         "php": "^8.1",
-        "silverstripe/recipe-plugin": "2.0.x-dev",
-        "silverstripe/vendor-plugin": "2.0.x-dev",
-        "silverstripe/recipe-cms": "5.3.x-dev",
-        "silverstripe-themes/simple": "3.3.x-dev",
-        "silverstripe/login-forms": "5.3.x-dev"
+        "silverstripe/recipe-plugin": "2.x-dev",
+        "silverstripe/vendor-plugin": "2.x-dev",
+        "silverstripe/recipe-cms": "5.x-dev",
+        "silverstripe-themes/simple": "3.x-dev",
+        "silverstripe/login-forms": "5.x-dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6"
@@ -34,4 +34,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
\ No newline at end of file
+}