Skip to content
Snippets Groups Projects
Commit 2f302d64 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Make handleMergeConflicts public 


Change-Id: Id33f3ff4b79242e6e86ff51a1699fe41df022bf9
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 7aed61fa
No related branches found
No related tags found
No related merge requests found
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