From b055fd06271e27810b6f15c8ecf5c2051b366dff Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:43 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=97=B6=E8=B7=B3=E8=BD=AC=E7=99=BB=E5=BD=95'=20(#303?=
 =?UTF-8?q?6)=20from=20fix-2915=20into=20V20221019?=
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 2a8c6e5c..320fe1c1 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修改Makefile
+Merge pull request '未登录时跳转登录' (#3036) from fix-2915 into V20221019