From baa4c6c23da2c107be7882f6420b4a5abad6f6c5 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:11 +0800
Subject: [PATCH] Merge branch 'V20220830' into fix-2546

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

diff --git a/src/test.txt b/src/test.txt
index a47f9a96..9ea095b7 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '改变字体大小和中英文国际化' (#2736) from fix-2546 into V20220830
+Merge branch 'V20220830' into fix-2546