[Bf-extensions-cvs] [6ba9c816] master: Fix syntax error by resolving merge conflict

[Sergey Sharybin]

Commit: 6ba9c816f3d8b342633cce3f874876f19b19118e
Author: Sergey Sharybin
Date:   Mon Aug 17 12:00:46 2020 +0200
Branches: master
https://developer.blender.org/rBA6ba9c816f3d8b342633cce3f874876f19b19118e

Fix syntax error by resolving merge conflict

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

M	io_coat3D/__init__.py

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

diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py
index 5679f638..574d9869 100644
--- a/io_coat3D/__init__.py
+++ b/io_coat3D/__init__.py
@@ -827,21 +827,11 @@ class SCENE_OT_export(bpy.types.Operator):
                                     if(node.name.startswith('3DC_') == True):
                                         material.material.node_tree.nodes.remove(node)
 
-<<<<<<< HEAD
-
-            for ind, mat_list in enumerate(mod_mat_list):
-                if(mat_list == '__' + objekti.name):
-                    for ind, mat in enumerate(mod_mat_list[mat_list]):
-                        objekti.material_slots[mod_mat_list[mat_list][ind][0]].material = mod_mat_list[mat_list][ind][1]
-
-=======
-        
                 for ind, mat_list in enumerate(mod_mat_list):
                     if(mat_list == '__' + objekti.name):
                         for ind, mat in enumerate(mod_mat_list[mat_list]):
                             objekti.material_slots[mod_mat_list[mat_list][ind][0]].material = mod_mat_list[mat_list][ind][1]
-            
->>>>>>> 215ebd2a... io_coat3D: support for mac. ignores all types except MESH
+
         bpy.context.scene.render.engine = active_render
         return {'FINISHED'}