Fixing merge issue

Signed-off-by: Neil Stout <[email protected]>
flyteorg · Mar 14, 2024 · 928d943 · 928d943
1 parent 2be920c
commit 928d943
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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