Commit Graph

1 Commits

Author SHA1 Message Date
Miles Gould
d301f2f2ae Add static check for files with merge conflicts
Fixes #1146
2017-02-07 15:03:52 +00:00