From a262422ecb5d536602ebfea3717db9b2894ee852 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:51 +0800
Subject: [PATCH] Merge branch 'V20220926' into zouap_dev

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

diff --git a/src/test.txt b/src/test.txt
index f58248b8..3da9a6cf 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request 'zouap_dev' (#2973) from zouap_dev into V20220926
+Merge branch 'V20220926' into zouap_dev