DeleteConflictDlg: Make abort the default action
commitf80d7fe240a606dc7d83576c346655ad5d3dcf10
authorSven Strickroth <email@cs-ware.de>
Fri, 21 Nov 2014 18:50:57 +0000 (21 19:50 +0100)
committerSven Strickroth <email@cs-ware.de>
Fri, 21 Nov 2014 18:50:57 +0000 (21 19:50 +0100)
tree813209c3987fbbbe4d443259e70745a2e42c31bd
parentf4f112fe8de1fe1e9037438defe9d891294a1bf0
DeleteConflictDlg: Make abort the default action

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/DeleteConflictDlg.cpp