[Bf-blender-cvs] [6ed9eab0102] fluid-mantaflow: Mantaflow: Post merge fixes

[Sebastián Barschkis]

Commit: 6ed9eab0102c57cdf7070893aeb79338b4078bc7
Author: Sebastián Barschkis
Date:   Sun Dec 15 22:41:56 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB6ed9eab0102c57cdf7070893aeb79338b4078bc7

Mantaflow: Post merge fixes

===================================================================

M	source/blender/python/intern/bpy_app_build_options.c

===================================================================

diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c
index d6e21992912..8b7ce646e26 100644
--- a/source/blender/python/intern/bpy_app_build_options.c
+++ b/source/blender/python/intern/bpy_app_build_options.c
@@ -58,11 +58,8 @@ static PyStructSequence_Field app_builtopts_info_fields[] = {
     {(char *)"openmp", NULL},
     {(char *)"openvdb", NULL},
     {(char *)"alembic", NULL},
-<<<<<<< HEAD
-    {(char *)"fluid", NULL},
-=======
     {(char *)"usd", NULL},
->>>>>>> master
+    {(char *)"fluid", NULL},
     {NULL},
 };