From 8d31f67ae5e8e2e68687ba79d99a19f8916fc69a Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:05 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E4=BF=A1=E6=81=AF=E5=90=88=E5=85=A5'=20(#2800)=20from?=
 =?UTF-8?q?=20zouap=5Fstatic=20into=20V20220830?=
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 1565f000..daebe1b9 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20220830' into res-manage-v2
+Merge pull request '国际化信息合入' (#2800) from zouap_static into V20220830