fix: resolve conflict

2022-10-26 20:41:21 +07:00
parent 3a90d246a4 e579610426
commit b459408b10
132 changed files with 9355 additions and 4129 deletions
--- a/server/database.js
+++ b/server/database.js
@@ -65,6 +65,7 @@ class Database {
        "patch-grpc-monitor.sql": true,
        "patch-add-radius-monitor.sql": true,
        "patch-monitor-add-resend-interval.sql": true,
+        "patch-maintenance-table2.sql": true,
    };

    /**