Conflicts:
include/igl/find_cross_field_singularities.cpp
include/igl/triangle_triangle_adjacency.cpp
Former-commit-id: 68f46289db
Conflicts:
include/igl/find_cross_field_singularities.cpp
include/igl/triangle_triangle_adjacency.cpp
Former-commit-id: 68f46289db