resolved error

0ee465c1 · mjg226 · 8a220db7 · 0ee465c1
Commit 0ee465c1 authored Jul 19, 2016 by mjg226
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

impls/square-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp ...are-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp +0 -7

No files found.
--- a/impls/square-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp
+++ b/impls/square-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp
@@ -195,17 +195,10 @@ namespace CA {
 			//Clock total_timer;

 			// Add file extension
-<<<<<<< HEAD
 			String _filename = filename + ".asc";

 			// Open file
 			std::ofstream onfile(_filename.c_str());
-=======
-			const char* extension = ".asc";
-
-			// Open file
-			std::ofstream onfile((filename + extension).c_str());
->>>>>>> 43b2f0300835482994887c602f0b7c2fb732f784

 			// Check if the file was open.
 			if (!onfile)