From 521fbe0bff3ebe4c22c6ba3d6d37d847226df957 Mon Sep 17 00:00:00 2001
From: shshanmu <32065904+shshanmu@users.noreply.github.com>
Date: Mon, 2 Aug 2021 19:19:38 +0200
Subject: [PATCH] Update Chart.yaml

---
 charts/argo-cd/Chart.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index fdde199e..37390a5a 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -1,9 +1,5 @@
 apiVersion: v2
-<<<<<<< HEAD
-appVersion: 2.0.5
-=======
 appVersion: 2.0.6
->>>>>>> d22212be3ebeb3d428f6817e0ee6befa46cf7ccc
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
 version: 3.11.1
@@ -25,8 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-<<<<<<< HEAD
-    - "[Changed]: Set server.staticAssets.enabled=true since Argo CD 2.0.5 still needs it"
-=======
     - "[Changed]: Openshift 4 specific Route command added in the NOTES.txt file"
->>>>>>> d22212be3ebeb3d428f6817e0ee6befa46cf7ccc