diff --git a/README.md b/README.md index cda524a..10d45b2 100644 --- a/README.md +++ b/README.md @@ -308,8 +308,14 @@ A huge thank you to all our sponsors for their generous support! - [@yusnake](https://github.com/yusnake) - @*飞 - @董* +<<<<<<< HEAD - @*琢 - @*成 - @**磊 +======= +- *汀 +- *涯 +- *:-) +>>>>>>> 2fc79dcf377ade7c4fc8883c94a6779fce830a5a (If your name is masked, please contact me via my homepage email to update it with your GitHub username.) diff --git a/README_zh.md b/README_zh.md index 859255b..b821074 100644 --- a/README_zh.md +++ b/README_zh.md @@ -305,9 +305,15 @@ jobs: - [@yusnake](https://github.com/yusnake) - @*飞 - @董* +<<<<<<< HEAD - @*琢 - @*成 - @**磊 +======= +- *汀 +- *涯 +- *:-) +>>>>>>> 2fc79dcf377ade7c4fc8883c94a6779fce830a5a (如果您的名字被屏蔽,请通过我的主页电子邮件与我联系,以便使用您的 GitHub 用户名进行更新。) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8147e76..862d7fa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,13 @@ importers: .: dependencies: '@musistudio/llms': +<<<<<<< HEAD specifier: ^1.0.9 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: specifier: ^16.4.7 version: 16.6.1 @@ -220,8 +225,13 @@ packages: '@modelcontextprotocol/sdk': optional: true +<<<<<<< HEAD '@musistudio/llms@1.0.9': resolution: {integrity: sha512-Z4H2yMcp3riDMQKAHTxqknanXgVSah/5HwDT5YtmsXaoznQpdzXLHlF4LBMMKNF6amq0R+MPfaPsjK8Lyddmxg==} +======= + '@musistudio/llms@1.0.8': + resolution: {integrity: sha512-C2GFoiw/DEo2faAQerRVOyWEupTJpoV+3z3rE9XEN31ySOcsaVPnKyWPmKKg9EDMBw70gQg5FZFg3jZxSCnWlA==} +>>>>>>> 2fc79dcf377ade7c4fc8883c94a6779fce830a5a '@nodelib/fs.scandir@2.1.5': resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} @@ -815,7 +825,11 @@ snapshots: - supports-color - utf-8-validate +<<<<<<< HEAD '@musistudio/llms@1.0.9(ws@8.18.3)(zod@3.25.67)': +======= + '@musistudio/llms@1.0.8(ws@8.18.3)(zod@3.25.67)': +>>>>>>> 2fc79dcf377ade7c4fc8883c94a6779fce830a5a dependencies: '@anthropic-ai/sdk': 0.54.0 '@fastify/cors': 11.0.1