fixed merge conflict

1 files changed, 0 insertions, 15 deletions

diff --git a/src/export.cc b/src/export.cc
index 862e82b..3b8b102 100644
--- a/src/export.cc
+++ b/src/export.cc
@@ -54,17 +54,6 @@ void export_stl(CGAL_Nef_polyhedron *root_N, std::ostream &output, QProgressDial
 
 	setlocale(LC_NUMERIC, "C"); // Ensure radix is . (not ,) in output
 
-<<<<<<< HEAD
-=======
-	std::ofstream output(filename.toUtf8());
-	if (!output.is_open()) {
-		PRINTA("Can't open STL file \"%1\" for STL export: %2", 
-					 filename, QString(strerror(errno)));
-		set_output_handler(NULL, NULL);
-		return;
-	}
-
->>>>>>> master
 	output << "solid OpenSCAD_Model\n";
 
 	int facet_count = 0;
@@ -123,10 +112,6 @@ void export_stl(CGAL_Nef_polyhedron *root_N, std::ostream &output, QProgressDial
 	}
 
 	output << "endsolid OpenSCAD_Model\n";
-<<<<<<< HEAD
-=======
-	output.close();
->>>>>>> master
 	setlocale(LC_NUMERIC, "");      // Set default locale
 }