From 50e27869892a1c4f49a6dae2819a469f6ec09b25 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20221228' into fix-3313

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

diff --git a/src/test.txt b/src/test.txt
index a00af07a..feb91c3d 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-merge
+Merge remote-tracking branch 'origin/V20221228' into fix-3313