From 8124cec3eaf8e0de48480681e4f00a5e9df041fc Mon Sep 17 00:00:00 2001 From: Nils Nemitz Date: Sun, 9 May 2021 22:07:59 +0900 Subject: [PATCH] missed a conflict marker --- pyqtgraph/colormap.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pyqtgraph/colormap.py b/pyqtgraph/colormap.py index 32ba41a4..36a9033b 100644 --- a/pyqtgraph/colormap.py +++ b/pyqtgraph/colormap.py @@ -169,11 +169,7 @@ def getFromMatplotlib(name): col_data[:,-1] = np.linspace(0., 1., 64) for idx, key in enumerate(['red','green','blue']): col_data[:,idx] = np.clip( data[key](col_data[:,-1]), 0, 1) -<<<<<<< HEAD - cmap = ColorMap(pos=col_data[:,-1], color=255*col_data[:,:3]+0.5) -======= - cm = ColorMap(pos=col_data[:,-1], color=255*col_data[:,:3]+0.5) ->>>>>>> upstream/master + cmap = ColorMap(pos=col_data[:,-1], color=255*col_data[:,:3]+0.5) elif hasattr(col_map, 'colors'): # handle ListedColormap col_data = np.array(col_map.colors) cmap = ColorMap( name=name,