From 8ed2b594107fcff08111bec94adc019b07448b83 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Fri, 26 May 2023 21:38:51 +0800 Subject: [PATCH] Resolve conflict --- server/model/monitor.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/model/monitor.js b/server/model/monitor.js index 6207f34d4..adeb35a04 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -1262,11 +1262,11 @@ class Monitor extends BeanModel { */ async sendCertNotificationByTargetDays(certCN, certType, daysRemaining, targetDays, notificationList) { - let row = await R.getRow("SELECT * FROM notification_sent_history WHERE type = ? AND monitor_id = ? AND days <= ?", [ - "certificate", - this.id, - targetDays, - ]); + let row = await R.getRow("SELECT * FROM notification_sent_history WHERE type = ? AND monitor_id = ? AND days <= ?", [ + "certificate", + this.id, + targetDays, + ]); // Sent already, no need to send again if (row) {