Cleanups.

BlueBrain · Oct 5, 2021 · e06ac61 · e06ac61
1 parent da5e7c1
commit e06ac61
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/vmv/builders/morphology/base.py b/vmv/builders/morphology/base.py
@@ -21,10 +21,7 @@
 
 # Blender imports
 import bpy
-<<<<<<< HEAD
 from mathutils import Vector
-=======
->>>>>>> 1d1524dfee63f4d2fb17d74386cf4b7862948b84
 
 # Internal imports
 import vmv
@@ -171,4 +168,3 @@ def build_skeleton(self,
         # Create the corresponding illumination
         vmv.shading.create_material_specific_illumination(
             material_type=self.options.morphology.material)
-
diff --git a/vmv/builders/morphology/segments_builder.py b/vmv/builders/morphology/segments_builder.py
@@ -1,9 +1,5 @@
 ####################################################################################################
-<<<<<<< HEAD
 # Copyright (c) 2019 - 2021, EPFL / Blue Brain Project
-=======
-# Copyright (c) 2018 - 2019, EPFL / Blue Brain Project
->>>>>>> 1d1524dfee63f4d2fb17d74386cf4b7862948b84
 # Author(s): Marwan Abdellah <[email protected]>
 #
 # This file is part of VessMorphoVis <https://github.com/BlueBrain/VessMorphoVis>
@@ -260,7 +256,7 @@ def get_poly_line_data_based_on_segment_index(self):
     # @get_poly_line_data_based_on_segment_alignment
     ################################################################################################
     def get_poly_line_data_based_on_segment_alignment(self):
-    	"""Gets a list of all the polylines based on the alignment of the segments in the morphology.
+        """Gets a list of all the polylines based on the alignment of the segments in the morphology.
         """
 
         # The poly-lines data list

diff --git a/vmv/utilities/colors.py b/vmv/utilities/colors.py
@@ -154,11 +154,7 @@ def create_colormap_from_color_list(color_list,
 
 
 ####################################################################################################
-<<<<<<< HEAD
 # @create_colormap_from_hex_list
-=======
-# @ create_colormap_from_hex_list
->>>>>>> 1d1524dfee63f4d2fb17d74386cf4b7862948b84
 ####################################################################################################
 def create_colormap_from_hex_list(hex_list,
                                   number_colors):
@@ -181,7 +177,6 @@ def create_colormap_from_hex_list(hex_list,
 
     # Create the RGB color list
     return create_colormap_from_color_list(rgb_color_list, number_colors)
-<<<<<<< HEAD
 
 
 ####################################################################################################
@@ -212,5 +207,3 @@ def create_xyz_color_list():
 
     # Return a reference to the colors
     return colors
-=======
->>>>>>> 1d1524dfee63f4d2fb17d74386cf4b7862948b84