Skip to content
Commit 312a5775 authored by Maik Qualmann's avatar Maik Qualmann
Browse files

add simple file conflict dialog when file conflicts are detected 

BUGS: 381625
FIXED-IN: 7.0.0
parent 40e42879
Pipeline #25152 passed with stage
in 48 minutes and 13 seconds
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