From ff6d71c59a2fb0f7f45756984edc006ddc37a8bf Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Fri, 6 Sep 2024 15:45:43 -0400
Subject: [PATCH] Adjust conflict

---
 composer.json                    | 2 +-
 src/mantle/testkit/composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index aaa83133..014aa006 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,7 @@
         "mantle-framework/view": "self.version"
     },
     "conflict": {
-        "phpunit/phpunit": ">11.0.0"
+        "phpunit/phpunit": ">=12.0.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
diff --git a/src/mantle/testkit/composer.json b/src/mantle/testkit/composer.json
index 2c27cf75..87753543 100644
--- a/src/mantle/testkit/composer.json
+++ b/src/mantle/testkit/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "mantle-framework/testkit",
-    "description": "The Mantle Framework Teskit Package",
+    "description": "The Mantle Framework Testkit Package",
     "keywords": ["testing", "mantle"],
     "type": "library",
     "require": {