8000 fix conflit doctrine/orm by NacerKH · Pull Request #208 · symfony/skeleton · GitHub
[go: up one dir, main page]
Skip to content

fix conflit doctrine/orm #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix conflit doctrine/orm #208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix conflit doctrine/orm
  • Loading branch information
@NacerKH
NacerKH committed Aug 7, 2022
commit 4059d970fa901bd6b245377b4d9cba4e27064002
7 changes: 5 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"php": ">=7.1.3",
"ext-ctype": "*",
"ext-iconv": "*",
"symfony/flex": "^1.3.1"
"symfony/flex": "^1.3.1",
"doctrine/orm": "^2.11"

},
"flex-require": {
"symfony/console": "*",
Expand Down Expand Up @@ -56,7 +58,8 @@
]
},
"conflict": {
"symfony/symfony": "*"
"symfony/symfony": "*",
"doctrine/orm": "^2.12"
},
"extra": {
"symfony": {
Expand Down
0