Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
Signed-off-by: Mior Muhammad Zaki <[email protected]>
  • Loading branch information
crynobone committed Nov 19, 2024
1 parent d83f519 commit bcbd493
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,18 @@
"php": "^8.2",
"composer-runtime-api": "^2.2",
"laravel/dusk": "^8.1",
<<<<<<< HEAD
"laravel/framework": "dev-php84 as 11.999.999",
"laravel/serializable-closure": "^1.3",
"orchestra/dusk-updater": "^2.6",
"orchestra/testbench": "dev-php84 as 9.5.999",
"orchestra/testbench-core": "dev-php84 as 9.5.999",
=======
"laravel/serializable-closure": "^1.3 || ^2.0",
"orchestra/dusk-updater": "^2.6",
"orchestra/testbench": "^9.6",
"orchestra/testbench-core": ">=9.6.0 <9.7.0",
>>>>>>> develop
"php-webdriver/webdriver": "^1.15.1",
"symfony/polyfill-php83": "^1.31"
},
"require-dev": {
"laravel/pint": "^1.17",
"laravel/tinker": "^2.9",
<<<<<<< HEAD
"phpstan/phpstan": "^1.11",
"phpunit/phpunit": "^10.5.35 || ^11.3.6"
=======
"phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^10.5 || ^11.0"
>>>>>>> develop
"phpunit/phpunit": "^10.5.35 || ^11.3.6"
},
"config": {
"preferred-install": {
Expand Down

0 comments on commit bcbd493

Please sign in to comment.