Skip to content
Snippets Groups Projects
Commit ecfc0a8e authored by Sven M. Hallberg's avatar Sven M. Hallberg
Browse files

fix conflict pretty-printing

parent 55c9a3d9
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 9 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment