merge develop and resolve conflict

MmgTools · Oct 16, 2024 · da2eb99 · da2eb99
1 parent f2655c9
commit da2eb99
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/ls_pmmg.c b/src/ls_pmmg.c
@@ -105,14 +105,7 @@ int PMMG_cuttet_ls(PMMG_pParMesh parmesh){
  int color_in_node,color_out_node;
  int color_in_edge,color_out_edge;
 
-<<<<<<< HEAD
- int idx_edge_ext,idx_edge_int,idx_edge_mesh;
- int idx_face_ext,idx_face_int,val_face;
-
- if ( parmesh->myrank == parmesh->info.root )
-=======
 if ( parmesh->myrank == parmesh->info.root )
->>>>>>> develop
  fprintf(stdout,"\n ## PMMG_cuttet_ls: Multimaterial not fully supported yet.\n");
 
  /* Ensure only one group on each proc */