blah blah merge fix

This commit is contained in:
newtbot 2023-12-20 22:26:47 +08:00
parent 81553bd091
commit 30336bcb28
2 changed files with 2331 additions and 1814 deletions

1484
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -19,7 +19,6 @@
"dependencies": { "dependencies": {
"bcrypt": "^5.1.1", "bcrypt": "^5.1.1",
"body-parser": "^1.20.2", "body-parser": "^1.20.2",
"coap": "^1.3.0",
"dotenv": "^16.3.1", "dotenv": "^16.3.1",
"ejs": "^3.1.9", "ejs": "^3.1.9",
"express": "^4.18.2", "express": "^4.18.2",