From 928d943b5050a65d60b87ae4fe2a88f2f9c74514 Mon Sep 17 00:00:00 2001
From: Neil Stout <neil.j.stout@lmco.com>
Date: Thu, 14 Mar 2024 20:07:02 +0000
Subject: [PATCH] Fixing merge issue

Signed-off-by: Neil Stout <neil.j.stout@lmco.com>
---
 deployment/sandbox/flyte_helm_generated.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/deployment/sandbox/flyte_helm_generated.yaml b/deployment/sandbox/flyte_helm_generated.yaml
index 7bd9f12b64..1b76108a88 100644
--- a/deployment/sandbox/flyte_helm_generated.yaml
+++ b/deployment/sandbox/flyte_helm_generated.yaml
@@ -7172,11 +7172,7 @@ spec:
   template:
     metadata:
       annotations:
-<<<<<<< HEAD
-        configChecksum: "3f87b4e38dcccebef4f630a9af22718ca79bf6e283b44a6368359b6698a4d2f"
-=======
         configChecksum: "ecefcb1d6df38b32a9ec77d91de63cd40da935a3239b70a5bb0396435878c80"
->>>>>>> origin/master
       labels: 
         app.kubernetes.io/name: flytepropeller
         app.kubernetes.io/instance: flyte