smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

Fix merge base marker is not removed on quit #248

Closed ypresto closed 7 years ago

ypresto commented 7 years ago

image

just typo... >_<

smashwilson commented 7 years ago

Good catch :+1: