songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix the bad conflict resolution

This commit is contained in:
Sébastien Loriot 2015-09-26 18:07:36 +02:00
parent da650cbd1c
commit f151025380
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h
View File

@ -72,9 +72,7 @@ template
< <
class ParameterizationMesh_3, ///< 3D surface mesh. class ParameterizationMesh_3, ///< 3D surface mesh.
class BorderParameterizer_3 class BorderParameterizer_3
= Two_vertices_parameterizer_3<ParameterizationMesh_3> = Two_vertices_parameterizer_3<ParameterizationMesh_3>,
#ifndef DOXYGEN_RUNNING
,
///< Strategy to parameterize the surface border. ///< Strategy to parameterize the surface border.
///< The minimum is to parameterize two vertices. ///< The minimum is to parameterize two vertices.
class SparseLinearAlgebraTraits_d class SparseLinearAlgebraTraits_d