From 6da5410110987c4472970658f274c039facfc793 Mon Sep 17 00:00:00 2001
From: "Lee Thomason (grinliz)" <leethomason@gmail.com>
Date: Sun, 9 Sep 2012 22:05:49 -0700
Subject: [PATCH] changes for martell to clean up fopen

---
 tinyxml2.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index c129fe8..bdb626e 100644
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -1607,13 +1607,8 @@ int XMLDocument::SaveFile( const char* filename, bool compact )
 	#endif
 		SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, filename, 0 );
 		return errorID;
-<<<<<<< HEAD
 	}
 	SaveFile(fp, compact);
-=======
-		}
-	SaveFile(fp);
->>>>>>> martell/master
 	fclose( fp );
 	return errorID;
 }