From 3976abaac3cb44d7910140317c00de4283d0c1ec Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@tobru.ch>
Date: Wed, 15 Dec 2021 20:37:21 +0100
Subject: [PATCH] fix bad merge

---
 argocd/argocd.yaml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/argocd/argocd.yaml b/argocd/argocd.yaml
index 8808ea1..6f0665c 100644
--- a/argocd/argocd.yaml
+++ b/argocd/argocd.yaml
@@ -3079,11 +3079,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-<<<<<<< HEAD
-        image: quay.io/argoproj/argocd:v2.1.8
-=======
         image: quay.io/argoproj/argocd:v2.2.0
->>>>>>> ab3e92a (upgrade argocd)
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -3258,9 +3254,6 @@ spec:
               key: reposerver.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-<<<<<<< HEAD
-        image: quay.io/argoproj/argocd:v2.1.8
-=======
         - name: HELM_CACHE_HOME
           value: /helm-working-dir
         - name: HELM_CONFIG_HOME
@@ -3268,7 +3261,6 @@ spec:
         - name: HELM_DATA_HOME
           value: /helm-working-dir
         image: quay.io/argoproj/argocd:v2.2.0
->>>>>>> ab3e92a (upgrade argocd)
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -3534,9 +3526,6 @@ spec:
               key: server.default.cache.expiration
               name: argocd-cmd-params-cm
               optional: true
-<<<<<<< HEAD
-        image: quay.io/argoproj/argocd:v2.1.8
-=======
         - name: ARGOCD_MAX_COOKIE_NUMBER
           valueFrom:
             configMapKeyRef:
@@ -3544,7 +3533,6 @@ spec:
               name: argocd-cmd-params-cm
               optional: true
         image: quay.io/argoproj/argocd:v2.2.0
->>>>>>> ab3e92a (upgrade argocd)
         imagePullPolicy: Always
         livenessProbe:
           httpGet: