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

docs: Remove merge conflict markers #15090

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Conversation

sponrad
Copy link
Contributor

@sponrad sponrad commented Dec 11, 2024

Summary

Don't want to see merge conflict syntax when reading/browsing it.

Copy link
Collaborator

@vkarpov15 vkarpov15 left a comment

Choose a reason for hiding this comment

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

Thanks 👍

@vkarpov15 vkarpov15 added this to the 8.9 milestone Dec 12, 2024
@vkarpov15 vkarpov15 merged commit 15ce176 into Automattic:master Dec 12, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants