From e0a26dcb28a5c3b9d58d5a7161ce9e4c65762803 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:01 +0800
Subject: [PATCH] Merge branch 'V20221228' into fix-3262

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

diff --git a/src/test.txt b/src/test.txt
index 8c002603..5ac85558 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-solve conflict
+Merge branch 'V20221228' into fix-3262