Remove forgotten conflict markers #4
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I was trying to scrape
CHANGES.txtto track it for new versions when I noticedthese conflict markers had been left around. They just duplicate the content of
their files, so I've removed them.
Incidentally, I wouldn't've needed to scrape
CHANGES.txtif this repo had tagswhenever a new version is released -- is there some reason this isn't done?