Resolve merge conflict in server/server.js and server/uptime-kuma-server.js

This commit is contained in:
iotux
2025-12-17 17:49:59 +01:00
2 changed files with 12 additions and 1 deletions
+9
View File
@@ -1248,6 +1248,9 @@ let needSetup = false;
monitorID,
value,
]);
await server.sendUpdateMonitorIntoList(socket, monitorID);
callback({
ok: true,
msg: "successAdded",
@@ -1271,6 +1274,9 @@ let needSetup = false;
tagID,
monitorID,
]);
await server.sendUpdateMonitorIntoList(socket, monitorID);
callback({
ok: true,
msg: "successEdited",
@@ -1294,6 +1300,9 @@ let needSetup = false;
monitorID,
value,
]);
await server.sendUpdateMonitorIntoList(socket, monitorID);
callback({
ok: true,
msg: "successDeleted",