Doesn't work when EditorConfig is enabled

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

https://atom.io/packages/merge-conflicts

MIT License

432 stars 42 forks source link

Closed ghost closed 8 years ago

ghost commented 8 years ago

There seems to be a conflict between merge-conflicts and EditorConfig.

When the latter is enabled merge-conflicts successfully detects conflicts, but when you click into a file the GUI elements are not present.

ghost commented 8 years ago

Closing as I was mistaken in thinking it was a conflict with this particular package.

This is related to issue #196