From eaa40ec87b696562e707ca1e209f6dd2cf6ea5ce Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:40:37 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'#1217=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D'=20(#1221)=20from=20fix-981=20into=20V20211228?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index e7bb6761..65189310 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix issue
+Merge pull request '#1217 修复' (#1221) from fix-981 into V20211228