fix the bad conflict resolution

2015-09-26 18:07:36 +02:00 · 2015-09-26 18:07:36 +02:00 · f151025380
parent da650cbd1c
commit f151025380
1 changed files with 1 additions and 3 deletions
--- 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<ParameterizationMesh_3>
-#ifndef DOXYGEN_RUNNING
- ,
+  = Two_vertices_parameterizer_3<ParameterizationMesh_3>,
                                      ///< Strategy to parameterize the surface border.
                                      ///< The minimum is to parameterize two vertices.
    class SparseLinearAlgebraTraits_d