Fix merge conflicts

This commit is contained in:
Tuan Dang
2024-06-06 23:20:09 -04:00
102 changed files with 3183 additions and 684 deletions
+1 -1
View File
@@ -114,7 +114,7 @@
"libsodium-wrappers": "^0.7.13",
"lodash.isequal": "^4.5.0",
"ms": "^2.1.3",
"mysql2": "^3.9.7",
"mysql2": "^3.9.8",
"nanoid": "^5.0.4",
"nodemailer": "^6.9.9",
"ora": "^7.0.1",