Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/upstream/update-testing' i…
Browse files Browse the repository at this point in the history
…nto update-testing

# Conflicts:
#	composer.json
  • Loading branch information
visto9259 committed Apr 26, 2024
2 parents 634ea60 + bbbad27 commit c8bbd1c
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 @@ -38,7 +38,7 @@
"php": "^7.3 || ^8.0",
"laminas/laminas-servicemanager": "^3.3",
"laminas/laminas-stdlib": "^3.1",
"doctrine/persistence": "^2.0 | ^3.0"
"doctrine/persistence": "^2.0 || ^3.0"
},
"require-dev": {
"malukenho/docheader": "^0.1.7",
Expand Down

0 comments on commit c8bbd1c

Please sign in to comment.