Skip to content

Commit

Permalink
Change version when resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
tabuna committed Apr 20, 2024
1 parent 232c4c8 commit 0f11b3c
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,13 @@
"doctrine/dbal": "^2.10 || ^3.0",
"fakerphp/faker": "^1.9.1",
"laravel/pint": "^1.14",
"orchestra/testbench-core": "^8.0 || ^9.0",
"orchestra/testbench-dusk": "^8.0 || ^9.0",
"phpunit/php-code-coverage": "^10.0 || ^11.0",
"orchestra/testbench-core": "^9.0",
"orchestra/testbench-dusk": "^9.0",
"phpunit/phpunit": "^10.0 || ^11.0",
"vimeo/psalm": "^5.0"
},
"conflict": {
"laravel/framework": "<10.2.0",
"laravel/framework": "<10.48.8",
"nesbot/carbon": "<2.66.0"
},
"autoload": {
Expand Down

0 comments on commit 0f11b3c

Please sign in to comment.