Skip to content
Commit 34fb3134 authored by Lukas Reschke's avatar Lukas Reschke Committed by GitHub
Browse files

Merge pull request #2689 from andreas-p/fix-remote-conflict 

Fix showConflict
parents 9b71ee27 c7fc0102
Hide whitespace changes
Inline Side-by-side
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