Skip to content

Commit

Permalink
fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-grekas committed Dec 25, 2021
1 parent e190153 commit 9c048ac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Doctrine/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"doctrine/collections": "~1.0",
"doctrine/data-fixtures": "^1.1",
"doctrine/dbal": "^2.13.1|^3.0",
"doctrine/orm": "^2.7.4"
"doctrine/orm": "^2.7.4",
"psr/log": "^1|^2|^3"
},
"conflict": {
Expand Down

0 comments on commit 9c048ac

Please sign in to comment.