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

Restore conflict-marker #6424

Merged
merged 2 commits into from
Mar 20, 2023
Merged

Restore conflict-marker #6424

merged 2 commits into from
Mar 20, 2023

Conversation

@fregante fregante added the bug label Mar 20, 2023

Test URLs:

https://github.com/refined-github/sandbox/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc+review
Copy link
Member Author

Choose a reason for hiding this comment

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

For #6422

@fregante fregante merged commit 236cccc into main Mar 20, 2023
@fregante fregante deleted the bugfix branch March 20, 2023 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

conflict-marker does not load
1 participant