Skip to content
Commit d3850a6a authored by Tobias Koenig's avatar Tobias Koenig
Browse files

Allow to disable automatic conflict handling 

svn path=/trunk/KDE/kdepimlibs/; revision=1159918
parent 28cee795
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