From 4742ab56f42c005e13d263befb13d777b8fda0ed Mon Sep 17 00:00:00 2001
From: Lixing Gu <gu@fsec.ucf.edu>
Date: Mon, 14 Sep 2015 15:58:50 -0400
Subject: [PATCH] Clean up after solving conflicts

---
 src/EnergyPlus/DXCoils.cc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/EnergyPlus/DXCoils.cc b/src/EnergyPlus/DXCoils.cc
index ba92e42a78b..faedca9a4d4 100644
--- a/src/EnergyPlus/DXCoils.cc
+++ b/src/EnergyPlus/DXCoils.cc
@@ -4101,11 +4101,6 @@ namespace DXCoils {
 							ShowWarningError( RoutineName + CurrentModuleObject + "=\"" + DXCoil( DXCoilNum ).Name + "\", invalid" );
 							ShowContinueError( "...not found " + cAlphaFields( 18 + ( I - 1 ) * 6 ) + "=\"" + Alphas( 18 + ( I - 1 ) * 6 ) + "\"." );
 						}
-<<<<<<< .mine
-//						ErrorsFound = true;
-=======
-						ErrorsFound = true;
->>>>>>> .theirs
 					} else {
 						// Verify Curve Object, only legal types are BiQuadratic
 						{ auto const SELECT_CASE_var( GetCurveType( DXCoil( DXCoilNum ).MSWasteHeat( I ) ) );