From 6c97810e418e941f92dceaa890552b2f2b779490 Mon Sep 17 00:00:00 2001
From: "konstantin.kiess" <konstantin.kiess@gmx.de>
Date: Wed, 4 Dec 2019 12:35:14 +0100
Subject: [PATCH] fixed unmerged file

---
 .../argo-cd/templates/argocd-configs/argocd-secret.yaml  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
index 707259cf..dcacb081 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -11,11 +11,7 @@ metadata:
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.server.name }}
 type: Opaque
-<<<<<<< HEAD
 {{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketSecret .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig) }}
-=======
-{{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketSecret) }}
->>>>>>> 5330efa6d8401074e250f3ecd2741c0bfbb6b692
 # Setting a blank data again will wipe admin password/key/cert
 data:
   {{- if .Values.configs.secret.githubSecret }}
@@ -27,7 +23,6 @@ data:
   {{- if .Values.configs.secret.bitbucketSecret }}
   bitbucket.webhook.uuid: {{ .Values.configs.secret.bitbucketSecret | b64enc }}
   {{- end }}
-<<<<<<< HEAD
   {{- if .Values.configs.secret.argocdServerTlsConfig }}
   tls.key: {{ .Values.configs.secret.argocdServerTlsConfig.key | b64enc }}
   tls.crt: {{ .Values.configs.secret.argocdServerTlsConfig.crt | b64enc }}
@@ -39,7 +34,3 @@ data:
   {{- end }}
 {{- end }}
 {{- end }}
-=======
-{{- end }}
-{{- end }}
->>>>>>> 5330efa6d8401074e250f3ecd2741c0bfbb6b692