Skip to content
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.

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

Conflict api-platform/core 2.7.0 #14309

Merged
merged 2 commits into from
Sep 15, 2022
Merged

Conflict api-platform/core 2.7.0 #14309

merged 2 commits into from
Sep 15, 2022

Conversation

loic425
Copy link
Member

@loic425 loic425 commented Sep 15, 2022

Q A
Branch? 1.11
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Related tickets
License MIT

Capture d’écran du 2022-09-15 09-43-43

Capture d’écran du 2022-09-15 10-00-06

@loic425 loic425 requested a review from a team as a code owner September 15, 2022 08:36
@probot-autolabeler probot-autolabeler bot added the API APIs related issues and PRs. label Sep 15, 2022
@@ -159,6 +159,7 @@
"sylius/user-bundle": "self.version"
},
"conflict": {
"api-platform/core": "2.7.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a proper note to the CONFLICTS file

@probot-autolabeler probot-autolabeler bot added the Maintenance CI configurations, READMEs, releases, etc. label Sep 15, 2022
@GSadee GSadee merged commit 4a103fc into Sylius:1.11 Sep 15, 2022
@GSadee
Copy link
Member

GSadee commented Sep 15, 2022

Thanks, Loïc! 🎉

@loic425 loic425 deleted the patch-2 branch September 15, 2022 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
API APIs related issues and PRs. Maintenance CI configurations, READMEs, releases, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants