Doc: fix a conflict-solving-bug introduced during the last "merge from master"

This commit is contained in:
Clement Jamin 2013-07-16 20:30:07 +02:00
parent 8aaee67985
commit 11fdd71222
1 changed files with 2 additions and 2 deletions

View File

@ -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`.