update templates and values

2023-11-15 20:21:14 +02:00 · 2023-11-15 20:21:14 +02:00 · 82e2bf4e3c
commit 82e2bf4e3c
parent f37a36f66f
1 changed files with 0 additions and 5 deletions
--- 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