@hackage resolve-trivial-conflicts0.3.1.2

Remove trivial conflict markers in a git repository

Remove trivial conflict markers in a git repository