From f02ca5adcd0acf2909bd42a2a1ae217b66c60736 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:40 +0800
Subject: [PATCH] Merge branch 'V20221102' into zouap_static

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

diff --git a/src/test.txt b/src/test.txt
index da01358a..e1d21373 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '解决： #3065' (#3066) from zouap_static into V20221102
+Merge branch 'V20221102' into zouap_static