From 295bdfeee961c760425a392942273febe1eb6cc9 Mon Sep 17 00:00:00 2001
From: Mior Muhammad Zaki <crynobone@gmail.com>
Date: Fri, 27 Dec 2024 09:04:49 +0800
Subject: [PATCH] fix merge conflict

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
---
 composer.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 06973a2f..7623c87e 100644
--- a/composer.json
+++ b/composer.json
@@ -16,12 +16,7 @@
         "laravel/pint": "^1.13",
         "laravel/sail": "dev-develop",
         "mockery/mockery": "^1.6",
-<<<<<<< HEAD
-        "phpunit/phpunit": "^10.5"
-=======
-        "nunomaduro/collision": "^8.1",
-        "phpunit/phpunit": "^11.0.1"
->>>>>>> 11.x
+        "phpunit/phpunit": "^11.3.6"
     },
     "autoload": {
         "psr-4": {