mirror of https://github.com/CGAL/cgal
Conflicts resolved by hand |
||
|---|---|---|
| .. | ||
| Surface_mesh_approximation | ||
| Variational_shape_approximation.h | ||
Conflicts resolved by hand |
||
|---|---|---|
| .. | ||
| Surface_mesh_approximation | ||
| Variational_shape_approximation.h | ||