mirror of
https://github.com/koichixD/uptime-kuma.git
synced 2026-09-04 17:23:21 +00:00
Resolve merge conflict in server/server.js and server/uptime-kuma-server.js
This commit is contained in:
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user