From 8925cc87bca38eea3c1ccd9c31486a12426e50e2 Mon Sep 17 00:00:00 2001
From: Ilia Medvedev <ilia.medvedev@codefresh.io>
Date: Wed, 15 Nov 2023 23:10:15 +0200
Subject: [PATCH] fix other charts issues

---
 .../templates/controller/workflow-controller-config-map.yaml   | 3 ---
 .../argo-workflows/templates/server/server-cluster-roles.yaml  | 2 --
 2 files changed, 5 deletions(-)

diff --git a/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml b/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
index a7c2cf2b..d4728a30 100644
--- a/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml
@@ -177,8 +177,6 @@ data:
     {{- with .Values.controller.retentionPolicy }}
     retentionPolicy: {{- toYaml . | nindent 6 }}
     {{- end }}
-<<<<<<< HEAD
-=======
     {{- with .Values.emissary.images }}
     images: {{- toYaml . | nindent 6 }}
     {{- end }}
@@ -193,4 +191,3 @@ data:
     {{- with .Values.controller.podGCDeleteDelayDuration }}
     podGCDeleteDelayDuration: {{ . }}
     {{- end }}
->>>>>>> argo-cd-5.27.1
diff --git a/charts/argo-workflows/templates/server/server-cluster-roles.yaml b/charts/argo-workflows/templates/server/server-cluster-roles.yaml
index 190fccec..56d4dcaa 100644
--- a/charts/argo-workflows/templates/server/server-cluster-roles.yaml
+++ b/charts/argo-workflows/templates/server/server-cluster-roles.yaml
@@ -31,8 +31,6 @@ rules:
   - list
   - watch
   - delete
-<<<<<<< HEAD
-=======
 - apiGroups:
   - ""
   resources: