Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ahuang11 committed Dec 12, 2023
1 parent 58b4ece commit c760cbc
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions hvplot/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -662,10 +662,7 @@ def _toggle_controls(self, event=None):
('Advanced', self.advanced),
]
if event and event.new not in ('area', 'kde', 'line', 'ohlc', 'rgb', 'step'):
colormapping_params = self._create_param(self.colormapping, widgets={
"clim": {"placeholder": "(min, max)"},
})
tabs.insert(5, ('Colormapping', colormapping_params))
tabs.insert(5, ('Colormapping', self.colormapping))
self._control_tabs[:] = tabs

def _check_y(self, event):
Expand Down

0 comments on commit c760cbc

Please sign in to comment.