From 1ac976b57b444bd0672c39b00d33a29c26864264 Mon Sep 17 00:00:00 2001
From: Fisher <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:41:33 +0800
Subject: [PATCH] Merge pull request 'merge-develop' (#326) from merge-develop
 into V202108

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

diff --git a/src/test.txt b/src/test.txt
index 4fa39507..6da76857 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix short name
+Merge pull request 'merge-develop' (#326) from merge-develop into V202108