SyncDlg Show Conflict when pull

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / resource.h

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 6e47101..3a9d50c 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ