dropped unused TortoiseSVN resolve conflict dialog
commit549bad6ba431aefdd2b9782facbb60d65933044f
authorSven Strickroth <email@cs-ware.de>
Sun, 13 May 2012 20:50:09 +0000 (13 22:50 +0200)
committerSven Strickroth <email@cs-ware.de>
Sun, 13 May 2012 20:50:09 +0000 (13 22:50 +0200)
treec010b9f513e77a891329937a8e510d2d99d2fd9b
parent95dcab81df74cc9ac4cd64e27b1889f4ddd71b6e
dropped unused TortoiseSVN resolve conflict dialog

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/ConflictResolveDlg.cpp [deleted file]
src/TortoiseProc/ConflictResolveDlg.h [deleted file]
src/TortoiseProc/resource.h