fix: 更新 pnpm-lock.yaml 和 README_zh.md,删除冲突标志信息

This commit is contained in:
Thlnking
2025-07-20 14:06:30 +08:00
parent 88fbf5e400
commit 269a87da74
2 changed files with 0 additions and 6 deletions

View File

@@ -308,7 +308,6 @@ jobs:
- @*琢 - @*琢
- @*成 - @*成
- @**磊 - @**磊
=======
- *汀 - *汀
- *涯 - *涯
- *:- - *:-

5
pnpm-lock.yaml generated
View File

@@ -9,13 +9,8 @@ importers:
.: .:
dependencies: dependencies:
'@musistudio/llms': '@musistudio/llms':
<<<<<<< HEAD
specifier: ^1.0.9 specifier: ^1.0.9
version: 1.0.9(ws@8.18.3)(zod@3.25.67) version: 1.0.9(ws@8.18.3)(zod@3.25.67)
=======
specifier: ^1.0.8
version: 1.0.8(ws@8.18.3)(zod@3.25.67)
>>>>>>> 2fc79dcf377ade7c4fc8883c94a6779fce830a5a
dotenv: dotenv:
specifier: ^16.4.7 specifier: ^16.4.7
version: 16.6.1 version: 16.6.1