Skip to content
Commit c7fc0102 authored by pflug's avatar pflug Committed by Andreas Pflug
Browse files

Fix showConflict 



use getFullFileName to show conflicting file
add original.directory to make fileExists happy

Signed-off-by: default avatarAndreas Pflug <dev@admin4.org>
parent 3714a6aa
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