malhuda/laravel
1
0
Fork 0
mirror of https://github.com/laravel/laravel.git synced 2025-02-20 11:53:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source 
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
This commit is contained in:
Mior Muhammad Zaki 2024-12-27 09:04:49 +08:00
parent 7e3c5bc23a
commit 295bdfeee9
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
composer.json
View File

@ -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": {