From 30b3ecfb1592ee818de43a80f476acb6d7056408 Mon Sep 17 00:00:00 2001
From: WrenIX <dev.github@wrenix.eu>
Date: Sun, 11 Aug 2024 21:55:01 +0200
Subject: [PATCH] chore: fix rebase error

---
 charts/nextcloud/values.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
index 007e58e3..54af8c8b 100644
--- a/charts/nextcloud/values.yaml
+++ b/charts/nextcloud/values.yaml
@@ -691,7 +691,6 @@ metrics:
       prometheus.io/port: "9205"
     labels: {}
 
-<<<<<<< HEAD
   # security context for the metrics CONTAINER in the pod
   securityContext:
     runAsUser: 1000
@@ -707,10 +706,7 @@ metrics:
   # seccompProfile:
   #   type: RuntimeDefault
 
-=======
-#
 prometheus:
->>>>>>> 6ed673a (feat(nextcloud): add notify_push support)
   ## Prometheus Operator ServiceMonitor configuration
   ## collects data from nextcloud metrics and notify_push if enabled
   serviceMonitor: