From e60b30ee2cee6fba2c2c699ed1e24ffe4199d334 Mon Sep 17 00:00:00 2001
From: Joe Sirianni <joe.sirianni@observiq.com>
Date: Wed, 24 Jul 2024 15:03:36 -0400
Subject: [PATCH] fix bad rebase

---
 internal/configuration/configuration.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/internal/configuration/configuration.go b/internal/configuration/configuration.go
index 0bba2e2..b691b6c 100644
--- 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.