Resolved conflict with 'python/py_igl.cpp'

2016-10-20 12:04:04 +02:00
parent 5686d72eec
commit e4655db202
1 changed files with 0 additions and 3 deletions
@@ -12,11 +12,8 @@
 #include <igl/avg_edge_length.h>
 #include <igl/barycenter.h>
 #include <igl/barycentric_coordinates.h>
-<<<<<<< HEAD
 #include <igl/barycentric_to_global.h>
-=======
 #include <igl/boundary_conditions.h>
->>>>>>> upstream/master
 #include <igl/boundary_facets.h>
 #include <igl/boundary_loop.h>
 #include <igl/cat.h>