From 3cd5917b3be77332c511fc41b2bc48dee3815d82 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:40:51 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'V20211213.patch?=
 =?UTF-8?q?=E5=90=88=E5=85=A5develop'=20(#1020)=20from=20V20211213.patch?=
 =?UTF-8?q?=20into=20develop?=
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..53cd04cb 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix issue
+Merge pull request 'V20211213.patch合入develop' (#1020) from V20211213.patch into develop