From f1510253806b4a41f9fc00cc1eb2f19efd706c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Sat, 26 Sep 2015 18:07:36 +0200 Subject: [PATCH] fix the bad conflict resolution --- .../include/CGAL/LSCM_parameterizer_3.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h index cecf306d138..5025eaf34ea 100644 --- a/Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h @@ -72,9 +72,7 @@ template < class ParameterizationMesh_3, ///< 3D surface mesh. class BorderParameterizer_3 - = Two_vertices_parameterizer_3 -#ifndef DOXYGEN_RUNNING - , + = Two_vertices_parameterizer_3, ///< Strategy to parameterize the surface border. ///< The minimum is to parameterize two vertices. class SparseLinearAlgebraTraits_d