Skip to content

Commit

Permalink
Merge pull request #37 from ttungbmt/patch-1
Browse files Browse the repository at this point in the history
Fix conflict doctrine/dbal
  • Loading branch information
joelbutcher authored Jan 12, 2021
2 parents 69e1ef5 + 5d90bb6 commit 37398a1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"require": {
"php": "^7.3|^8.0",
"doctrine/dbal": "^3.0",
"doctrine/dbal": "^2.9|^3.0",
"illuminate/support": "^8.0",
"laravel/jetstream": "^2.0.0",
"laravel/socialite": "^5.0"
Expand Down

0 comments on commit 37398a1

Please sign in to comment.