From 05b0a6f98d4b17d458f7f7ad2368aacf44294145 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20221102' into fix-csh

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

diff --git a/src/test.txt b/src/test.txt
index a00af07a..0282ad58 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-merge
+Merge remote-tracking branch 'origin/V20221102' into fix-csh