From 461403ec94fec69696f9f1a2a6f1494a17fcfb85 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:11 +0800
Subject: [PATCH] Merge branch 'V20220830' into fix-2628

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

diff --git a/src/test.txt b/src/test.txt
index 50b64f10..968a5361 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20220830' into zouap
+Merge branch 'V20220830' into fix-2628