From a6239a6200f49c26a45c3771338f90a0baa349ad Mon Sep 17 00:00:00 2001
From: iotux <eigilb@gmail.com>
Date: Thu, 1 Jan 2026 12:18:56 +0100
Subject: [PATCH] Fixed a linting err

---
 server/uptime-kuma-server.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index 2924a0665..38a7d9831 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -124,11 +124,8 @@ class UptimeKumaServer {
         UptimeKumaServer.monitorTypeList["port"] = new TCPMonitorType();
         UptimeKumaServer.monitorTypeList["manual"] = new ManualMonitorType();
         UptimeKumaServer.monitorTypeList["redis"] = new RedisMonitorType();
-<<<<<<< HEAD
         UptimeKumaServer.monitorTypeList["system-service"] = new SystemServiceMonitorType();
-=======
         UptimeKumaServer.monitorTypeList["sqlserver"] = new MssqlMonitorType();
->>>>>>> upstream/master
 
         // Allow all CORS origins (polling) in development
         let cors = undefined;