Skip to content
Commit 43d17c4d authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Add conflict resolution to places it was missing and could be handy

parent 386addd9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment