diff options
Diffstat (limited to 'source/blender/blenkernel/intern/BME_tools.c')
| -rw-r--r-- | source/blender/blenkernel/intern/BME_tools.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/BME_tools.c b/source/blender/blenkernel/intern/BME_tools.c index 9dd4669ba1f..8efc2d0e955 100644 --- a/source/blender/blenkernel/intern/BME_tools.c +++ b/source/blender/blenkernel/intern/BME_tools.c @@ -41,11 +41,8 @@ #include "DNA_object_types.h" #include "BLI_math.h" -<<<<<<< .working #include "BLI_cellalloc.h" -======= #include "BLI_utildefines.h" ->>>>>>> .merge-right.r35190 #include "BKE_bmesh.h" |