Remove remaining <<<<

2017-07-18 09:34:15 +02:00 · 2017-07-18 09:34:15 +02:00 · 443f948e1d
parent f7e9249241
commit 443f948e1d
1 changed files with 1 additions and 3 deletions
--- a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp
@ -27,12 +27,10 @@
 #include <CGAL/IO/File_writer_wavefront.h>
 #include <CGAL/IO/generic_copy_OFF.h>
 #include <CGAL/IO/OBJ_reader.h>
-<<<<<<< HEAD
 #include <CGAL/Polygon_mesh_processing/measure.h>
 #include <CGAL/statistics_helpers.h>
-=======
+
 #include <QMenu>
->>>>>>> Add an action in the context menu of polyhedron and SM items to reset colors.

 //Used to triangulate the AABB_Tree
 class Primitive