Sfoglia il codice sorgente

Resolved conflict in python/py_doc.cpp

Former-commit-id: 5686d72eec9620352edc86c578b5de46e80c34a8
Guillermo Lomas Rodríguez 8 anni fa
parent
commit
4b8d479be6
1 ha cambiato i file con 0 aggiunte e 4 eliminazioni
  1. 0 4
      python/py_doc.cpp

+ 0 - 4
python/py_doc.cpp

@@ -275,12 +275,8 @@ const char *__doc_igl_copyleft_cgal_remesh_self_intersections = R"igl_Qu8mg5v7(/
       //     // remove any vertices now unreferenced after duplicate mapping.
       //     // remove any vertices now unreferenced after duplicate mapping.
       //     igl::remove_unreferenced(VV,FF,SV,SF,UIM);
       //     igl::remove_unreferenced(VV,FF,SV,SF,UIM);
       //     // Now (SV,SF) is ready to extract outer hull
       //     // Now (SV,SF) is ready to extract outer hull
-<<<<<<< HEAD
-      //     igl::copyleft::cgal::outer_hull(SV,SF,G,J,flip);)igl_Qu8mg5v7";
-=======
       //     igl::copyleft::cgal::outer_hull(SV,SF,G,J,flip);
       //     igl::copyleft::cgal::outer_hull(SV,SF,G,J,flip);
       //)igl_Qu8mg5v7";
       //)igl_Qu8mg5v7";
->>>>>>> upstream/master
 const char *__doc_igl_copyleft_comiso_miq = R"igl_Qu8mg5v7(// Inputs:
 const char *__doc_igl_copyleft_comiso_miq = R"igl_Qu8mg5v7(// Inputs:
     //   V              #V by 3 list of mesh vertex 3D positions
     //   V              #V by 3 list of mesh vertex 3D positions
     //   F              #F by 3 list of faces indices in V
     //   F              #F by 3 list of faces indices in V