Conflicts:
include/igl/per_vertex_normals.cpp
include/igl/triangle_triangle_adjacency.cpp
Former-commit-id: 05848e2e96
Conflicts:
include/igl/per_vertex_normals.cpp
include/igl/triangle_triangle_adjacency.cpp
Former-commit-id: 05848e2e96