From b58b7fedb6e1708b84ea45ba26705dc0c3152570 Mon Sep 17 00:00:00 2001
From: Jesper Noordsij <45041769+jnoordsij@users.noreply.github.com>
Date: Tue, 1 Apr 2025 16:50:26 +0200
Subject: [PATCH] Fix unresolved merge conflict in Concurrency composer.json

---
 src/Illuminate/Concurrency/composer.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Illuminate/Concurrency/composer.json b/src/Illuminate/Concurrency/composer.json
index 2f8d1e6c7ae2..0a5d5c39bbe4 100644
--- a/src/Illuminate/Concurrency/composer.json
+++ b/src/Illuminate/Concurrency/composer.json
@@ -14,19 +14,11 @@
         }
     ],
     "require": {
-<<<<<<< HEAD
         "php": "^8.3",
         "illuminate/console": "^13.0",
         "illuminate/contracts": "^13.0",
         "illuminate/process": "^13.0",
         "illuminate/support": "^13.0",
-=======
-        "php": "^8.2",
-        "illuminate/console": "^12.0",
-        "illuminate/contracts": "^12.0",
-        "illuminate/process": "^12.0",
-        "illuminate/support": "^12.0",
->>>>>>> 12.x
         "laravel/serializable-closure": "^1.3|^2.0"
     },
     "autoload": {