From 7e70315514c850bf8bd29877abe469eda8f5e5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= <lauri.vosandi@gmail.com>
Date: Thu, 12 Sep 2024 22:15:10 +0300
Subject: [PATCH] monitoring: Fix snmp-exporter

---
 monitoring/snmp-exporter.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/monitoring/snmp-exporter.yaml b/monitoring/snmp-exporter.yaml
index 1b1c4a6..1f5721b 100644
--- a/monitoring/snmp-exporter.yaml
+++ b/monitoring/snmp-exporter.yaml
@@ -88,10 +88,6 @@ spec:
         - ups-4.mgmt.k-space.ee
         - ups-6.mgmt.k-space.ee
         - ups-7.mgmt.k-space.ee
-<<<<<<< HEAD
-=======
-        - ups-6.mgmt.k-space.ee
->>>>>>> 80cb1eb (replace ups)
         - ups-9.mgmt.k-space.ee
 ---
 apiVersion: monitoring.coreos.com/v1