Skip to content
This repository has been archived by the owner on Nov 8, 2017. It is now read-only.

Clean up resolved markers #136

Merged
merged 4 commits into from
Apr 11, 2015
Merged

Clean up resolved markers #136

merged 4 commits into from
Apr 11, 2015

Conversation

smashwilson
Copy link
Owner

When conflict detection is either completed or exited, clean up any remaining markers.

Fixes #131.

smashwilson added a commit that referenced this pull request Apr 11, 2015
@smashwilson smashwilson merged commit 565a9be into master Apr 11, 2015
@smashwilson smashwilson deleted the 131-cleanup-resolved-markers branch April 11, 2015 23:48
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge-Conflicts Highlighted Text
1 participant