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.

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

Jump to bottom

Update CONFLICTS.MD #12215

Merged
merged 1 commit into from
Dec 31, 2020
Merged

Update CONFLICTS.MD #12215

merged 1 commit into from
Dec 31, 2020

Conversation

Tomanhez
Copy link
Contributor

Q A
Branch? master
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
License MIT

Note for: #12214

@Tomanhez Tomanhez added the Bug Confirmed bugs or bugfixes. label Dec 31, 2020
@Tomanhez Tomanhez requested a review from a team as a code owner December 31, 2020 10:06
@probot-autolabeler probot-autolabeler bot added the Maintenance CI configurations, READMEs, releases, etc. label Dec 31, 2020
@Tomanhez Tomanhez force-pushed the add-note-in-conflict-md branch from ca24cb6 to d5bb0d7 Compare December 31, 2020 10:07
pamil
pamil reviewed Dec 31, 2020
View reviewed changes
CONFLICTS.md Outdated Show resolved Hide resolved
@Tomanhez Tomanhez force-pushed the add-note-in-conflict-md branch 2 times, most recently from ea1698f to c4bd5b4 Compare December 31, 2020 10:26
@Tomanhez Tomanhez force-pushed the add-note-in-conflict-md branch from c4bd5b4 to 0c87905 Compare December 31, 2020 10:29
@pamil pamil merged commit 97c62e7 into Sylius:master Dec 31, 2020
@pamil
Copy link
Contributor

pamil commented Dec 31, 2020

Thank you, Tomasz! 🥇

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pamil pamil pamil approved these changes

Assignees
No one assigned
Labels
Bug Confirmed bugs or bugfixes. Maintenance CI configurations, READMEs, releases, etc.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Tomanhez @pamil