From 11fdd71222d491dd40497bf8c6b42acdf7d4dbef Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Tue, 16 Jul 2013 20:30:07 +0200 Subject: [PATCH] Doc: fix a conflict-solving-bug introduced during the last "merge from master" --- Mesh_3/doc/Mesh_3/CGAL/Mesh_triangulation_3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mesh_3/doc/Mesh_3/CGAL/Mesh_triangulation_3.h b/Mesh_3/doc/Mesh_3/CGAL/Mesh_triangulation_3.h index 7f3d404b215..3810b34106d 100644 --- a/Mesh_3/doc/Mesh_3/CGAL/Mesh_triangulation_3.h +++ b/Mesh_3/doc/Mesh_3/CGAL/Mesh_triangulation_3.h @@ -3,8 +3,8 @@ namespace CGAL { /*! \ingroup PkgMesh_3MeshClasses -The class `Mesh_triangulation_3` is a metafunctor which provides the triangulation to be used as the 3D -triangulation of a mesh generation process. +The class `Mesh_triangulation_3` is a metafunctor which provides the triangulation type to be used +for the 3D triangulation embedding the mesh. \tparam MD stands for a model of `MeshDomain_3`.