From 269a87da740accb650bc60b7618a25bea47fedeb Mon Sep 17 00:00:00 2001
From: Thlnking <2927874032@qq.com>
Date: Sun, 20 Jul 2025 14:06:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=20pnpm-lock.yaml=20?=
 =?UTF-8?q?=E5=92=8C=20README=5Fzh.md=EF=BC=8C=E5=88=A0=E9=99=A4=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E6=A0=87=E5=BF=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README_zh.md   | 1 -
 pnpm-lock.yaml | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/README_zh.md b/README_zh.md
index 03b1649..64290c6 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -308,7 +308,6 @@ jobs:
 - @*琢
 - @*成
 - @**磊
-=======
 - *汀
 - *涯
 - *:-）
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 862d7fa..871d74a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,13 +9,8 @@ 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