fix bad rebase

observIQ · Jul 24, 2024 · e60b30e · e60b30e
1 parent f1e0093
commit e60b30e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/internal/configuration/configuration.go b/internal/configuration/configuration.go
@@ -95,7 +95,6 @@ func WithMatchLabels(match map[string]string) Option {
 	}
 }
 
-<<<<<<< HEAD
 // WithRolloutOptions takes a model.ResourceConfiguration and returns
 // an Option that configures a configuration's rollout options. It is safe
 // to pass model.ResourceConfiguration's zero value to this function.