Skip to content

Commit 780533b

Browse files
authored
Fix unresolved merge conflict in Concurrency composer.json (#55233)
1 parent dd8b2fe commit 780533b

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/Illuminate/Concurrency/composer.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,11 @@
1414
}
1515
],
1616
"require": {
17-
<<<<<<< HEAD
1817
"php": "^8.3",
1918
"illuminate/console": "^13.0",
2019
"illuminate/contracts": "^13.0",
2120
"illuminate/process": "^13.0",
2221
"illuminate/support": "^13.0",
23-
=======
24-
"php": "^8.2",
25-
"illuminate/console": "^12.0",
26-
"illuminate/contracts": "^12.0",
27-
"illuminate/process": "^12.0",
28-
"illuminate/support": "^12.0",
29-
>>>>>>> 12.x
3022
"laravel/serializable-closure": "^1.3|^2.0"
3123
},
3224
"autoload": {

0 commit comments

Comments
 (0)