error after rebase

python-visualization · May 18, 2024 · d59cee9 · d59cee9
1 parent 00f9a0e
commit d59cee9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/branca/colormap.py b/branca/colormap.py
@@ -110,12 +110,8 @@ def __init__(
         self.vmin = vmin
         self.vmax = vmax
         self.caption = caption
-<<<<<<< HEAD
         self.text_color = text_color
-        self.index = [vmin, vmax]
-=======
         self.index: List[float] = [vmin, vmax]
->>>>>>> ec6251d... utilities.py wip
         self.max_labels = max_labels
         self.tick_labels: Optional[Sequence[Union[float, str]]] = None