From 5c2b3d4c9892ad9c3b8efab3e1cd2e54d055a45d Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Thu, 31 Jul 2014 19:37:32 +0800 Subject: [PATCH] Remove extra tab Signed-off-by: Sup Yut Sum --- src/TortoiseProc/AppUtils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TortoiseProc/AppUtils.h b/src/TortoiseProc/AppUtils.h index 4323defdc..daffe4f58 100644 --- a/src/TortoiseProc/AppUtils.h +++ b/src/TortoiseProc/AppUtils.h @@ -155,7 +155,7 @@ public: static bool IgnoreFile(CTGitPathList &filelist,bool IsMask); static bool GitReset(CString *CommitHash,int type=1); - static bool ConflictEdit(CTGitPath& file, bool bAlternativeTool = false, bool revertTheirMy = false, HWND resolveMsgHwnd = nullptr); + static bool ConflictEdit(CTGitPath& file, bool bAlternativeTool = false, bool revertTheirMy = false, HWND resolveMsgHwnd = nullptr); static CString GetMergeTempFile(CString str,CTGitPath &merge); static bool StashSave(); -- 2.11.4.GIT