From 68ec4b5f005c353e6c073553baf77639d1f31dc2 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:50:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20221228' into fix-csh

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

diff --git a/src/test.txt b/src/test.txt
index b220d275..44007f99 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '#3314 注册和登录页面，增加开发者大会的活动链接' (#3472) from fix-csh into V20221228
+Merge remote-tracking branch 'origin/V20221228' into fix-csh