From 82e2bf4e3c3211e23c90cedfbc0f59040bb2d85a Mon Sep 17 00:00:00 2001
From: Ilia Medvedev <ilia.medvedev@codefresh.io>
Date: Wed, 15 Nov 2023 20:21:14 +0200
Subject: [PATCH] update templates and values

---
 charts/argo-rollouts/Chart.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml
index 1e917ca4..6d343fdc 100644
--- a/charts/argo-rollouts/Chart.yaml
+++ b/charts/argo-rollouts/Chart.yaml
@@ -18,10 +18,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-<<<<<<< HEAD
-    - kind: changed
-      description: Upgrade Argo Rollouts to v1.6.0
-=======
     - kind: fixed
       description: Update AnalysisRun CRD to match upstream
->>>>>>> argo-cd-5.50.1