From a933766fca7e4535b763d80f7e30964c6b59845e Mon Sep 17 00:00:00 2001
From: marmila <64802282+marmila@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:48:56 +0100
Subject: [PATCH] Update Chart.yaml

---
 argocd/system/logging/Chart.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/argocd/system/logging/Chart.yaml b/argocd/system/logging/Chart.yaml
index 7fe37f87..c73c64f9 100644
--- a/argocd/system/logging/Chart.yaml
+++ b/argocd/system/logging/Chart.yaml
@@ -12,11 +12,7 @@ dependencies:
     version: 0.40.0
     repository: https://fluent.github.io/helm-charts
   - name: loki
-<<<<<<< HEAD
-    version: 5.36.3
-=======
     version: 5.38.0
->>>>>>> upstream/master
     repository: https://grafana.github.io/helm-charts
   - name: prometheus-elasticsearch-exporter
     version: 5.3.1