SyncDlg Show Conflict when pull

[tortoisegit/TortoiseGitJp.git] / src / Resources / TortoiseProcENG.rc

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 833d395..9460c83 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ