fix: merge tons of conflict

This commit is contained in:
ikechan8370 2023-07-01 15:55:07 +08:00
commit 7a8b30db14
50 changed files with 1791 additions and 828 deletions

View file

@ -30,7 +30,8 @@
"random": "^4.1.0",
"undici": "^5.21.0",
"uuid": "^9.0.0",
"ws": "^8.13.0"
"ws": "^8.13.0",
},
"optionalDependencies": {
"@node-rs/jieba": "^1.6.2",