From 7335409a05275ac23b3c5ef620b03ce89f30c5eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Juan=20G=C3=B3mez=20Pe=C3=B1alver?=
 <carlosjuangp@gmail.com>
Date: Tue, 10 Mar 2020 23:08:24 +0000
Subject: [PATCH] fix: rebase conflict

---
 .../argo-cd/templates/argocd-repo-server/deployment.yaml   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 561a7580..6700497e 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -55,16 +55,11 @@ spec:
         {{- if .Values.redis.enabled }}
         - --redis
         - {{ template "argo-cd.redis.fullname" . }}:{{ .Values.redis.servicePort }}
-        {{- end }}
+        {{- Send }}
         - --loglevel
         - {{ .Values.repoServer.logLevel }}
-<<<<<<< HEAD
         {{- with .Values.repoServer.extraArgs }}
         {{- . | toYaml | nindent 8 }}
-=======
-        {{- with .Values.controller.extraArgs }}
-        {{  . | toYaml | nindent 8 }}
->>>>>>> feat: extraArgs allows same flag multiple times
         {{- end }}
         {{- if .Values.repoServer.containerSecurityContext }}
         securityContext: {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }}