From f153fb24b5cc1e798f1a03e804e4431c3fb114d4 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Mon, 10 Nov 2014 21:27:44 +0800
Subject: [PATCH] Remove wrong cast

Based on TortoiseSVN revision 26033

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/TortoiseMerge/Undo.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TortoiseMerge/Undo.cpp b/src/TortoiseMerge/Undo.cpp
index 69cddbc83..088c70ff5 100644
--- a/src/TortoiseMerge/Undo.cpp
+++ b/src/TortoiseMerge/Undo.cpp
@@ -257,11 +257,11 @@ void CUndo::Undo(const viewstate& state, CBaseView * pView, const POINT& pt)
 	}
 	for (std::map<int, EOL>::const_iterator it = state.linesEOL.begin(); it != state.linesEOL.end(); ++it)
 	{
-		viewData->SetLineEnding(it->first, (EOL)it->second);
+		viewData->SetLineEnding(it->first, it->second);
 	}
 	for (std::map<int, bool>::const_iterator it = state.markedlines.begin(); it != state.markedlines.end(); ++it)
 	{
-		viewData->SetMarked(it->first, (EOL)it->second);
+		viewData->SetMarked(it->first, it->second);
 	}
 	for (std::map<int, CString>::const_iterator it = state.difflines.begin(); it != state.difflines.end(); ++it)
 	{
-- 
2.11.4.GIT