From fea27d1fa9d9b464aee3914ea673b60e5baf7f55 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:39 +0800
Subject: [PATCH] Merge branch 'V20221102' into fix-2906

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

diff --git a/src/test.txt b/src/test.txt
index 1b5b579e..af417785 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20221102' into zouap_static
+Merge branch 'V20221102' into fix-2906