Skip to content

disambiguate underline from git conflict marker #340

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

Merged

Conversation

karenetheridge
Copy link
Member

Some tools object to ======= appearing at the beginning of a line, thinking it is indicating a git conflict.

Some tools object to ======= appearing at the beginning of a line, thinking it is indicating a git conflict.
@Julian
Copy link
Member

Julian commented Apr 23, 2020

Sounds suspicious/wrong of those tools to do so (they'd get quite confused if say the readme was reST instead of md which it used to be)

But don't really object I suppose to merging this. Thanks!

@Julian Julian merged commit 807591f into json-schema-org:master Apr 23, 2020
@karenetheridge karenetheridge deleted the ether/markdown-conflict-markers branch April 23, 2020 18:14
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