opened
simonlogicspot
username_0
There seems to be a conflict between _merge-conflicts_ and [_EditorConfig_](https://github.com/sindresorhus/atom-editorconfig). 

When the latter is enabled _merge-conflicts_ successfully detects conflicts, but when you click into a file the GUI elements are not present.
Doesn't work when EditorConfig is enabled
issue
closed
simonlogicspot
username_0
issue
created
simonlogicspot
username_0
Closing as I was mistaken in thinking it was a conflict with this particular package. 

This is related to issue [#196](https://github.com/smashwilson/merge-conflicts/issues/196)
comment