From 7c941bedebcecf435e194a1e0d0013f9cbd52f43 Mon Sep 17 00:00:00 2001
From: Willian Paixao <willian@ufpa.br>
Date: Wed, 27 Nov 2024 14:33:00 +0100
Subject: [PATCH] fix(git): remove conflict tag

---
 .../kube-prometheus-stack/app/alertmanager-config.yaml           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kubernetes/raspberry/observability/kube-prometheus-stack/app/alertmanager-config.yaml b/kubernetes/raspberry/observability/kube-prometheus-stack/app/alertmanager-config.yaml
index 80929aab..fe1a461b 100644
--- a/kubernetes/raspberry/observability/kube-prometheus-stack/app/alertmanager-config.yaml
+++ b/kubernetes/raspberry/observability/kube-prometheus-stack/app/alertmanager-config.yaml
@@ -29,7 +29,6 @@ spec:
           - name: 'severity'
             value: 'page'
             matchType: '='
->>>>>>> f46cd93 (feat(prom): update alertmanagerconfig)
   receivers:
     - name: 'null'
     - name: 'telegram'