fix other charts issues

2023-11-15 23:10:15 +02:00 · 2023-11-15 23:10:15 +02:00 · 8925cc87bc
commit 8925cc87bc
parent 0b0940e6a2
2 changed files with 0 additions and 5 deletions
--- 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
--- 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: