MNT fix bad merge

This commit is contained in:
Guy Sartorelli 2024-10-03 10:56:37 +13:00
parent 6bb9e465b6
commit c3f430261a
No known key found for this signature in database

View File

@ -4,11 +4,11 @@
"description": "The SilverStripe Framework Installer", "description": "The SilverStripe Framework Installer",
"require": { "require": {
"php": "^8.1", "php": "^8.1",
"silverstripe/recipe-plugin": "2.0.x-dev", "silverstripe/recipe-plugin": "2.x-dev",
"silverstripe/vendor-plugin": "2.0.x-dev", "silverstripe/vendor-plugin": "2.x-dev",
"silverstripe/recipe-cms": "5.3.x-dev", "silverstripe/recipe-cms": "5.x-dev",
"silverstripe-themes/simple": "3.3.x-dev", "silverstripe-themes/simple": "3.x-dev",
"silverstripe/login-forms": "5.3.x-dev" "silverstripe/login-forms": "5.x-dev"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.6" "phpunit/phpunit": "^9.6"