fix(git): remove conflict tag

willianpaixao · Nov 27, 2024 · 7c941be · 7c941be
1 parent 48b868b
commit 7c941be
Showing 1 changed file with 0 additions and 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
@@ -29,7 +29,6 @@ spec:
           - name: 'severity'
             value: 'page'
             matchType: '='
->>>>>>> f46cd93 (feat(prom): update alertmanagerconfig)
   receivers:
     - name: 'null'
     - name: 'telegram'