diff --git a/keras_cv/layers/preprocessing/equalization.py b/keras_cv/layers/preprocessing/equalization.py index 5151a4b859..3c57789c6e 100644 --- a/keras_cv/layers/preprocessing/equalization.py +++ b/keras_cv/layers/preprocessing/equalization.py @@ -45,10 +45,7 @@ class Equalization(tf.keras.__internal__.layers.BaseImageAugmentationLayer): def __init__(self, bins=256, value_range=(0, 255), **kwargs): super().__init__(**kwargs) self.bins = bins -<<<<<<< HEAD self.value_range = value_range -======= ->>>>>>> Vectorizing Equalization @tf.function def equalize_channel(self, image, channel_index):