Skip to content
Unverified Commit 7ea06dac authored by Robin Appelman's avatar Robin Appelman
Browse files

still trigger conflict resolution for existing entries when the current entry doesn't need it 



Signed-off-by: default avatarRobin Appelman <robin@icewind.nl>
parent aa789989
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