From 7d5468ae8b04d59240265579cce61d81268a48d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=A4?= <tanglj@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:38 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E8=A7=A3=E5=86=B3#30?=
 =?UTF-8?q?63=20=E7=9A=84issue'=20(#3103)=20from=20zouap=5Fstatic=20into?=
 =?UTF-8?q?=20V20221102?=
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 0cf8a28f..f77549fa 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20221102' into fix-2959
+Merge pull request '解决#3063 的issue' (#3103) from zouap_static into V20221102