Update Chart.yaml

marmila · Dec 19, 2023 · f11ca84 · f11ca84
1 parent eec62b5
commit f11ca84
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/argocd/system/monitoring/Chart.yaml b/argocd/system/monitoring/Chart.yaml
@@ -5,7 +5,3 @@ dependencies:
   - name: kube-prometheus-stack
     version: 51.10.0
     repository: https://prometheus-community.github.io/helm-charts
-<<<<<<< HEAD
-
-=======
->>>>>>> 6652336 (fix merge issues)