From d50dec823d3df7f828ee28473ae791e697de09ff Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:26 +0800
Subject: [PATCH] merge

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

diff --git a/src/test.txt b/src/test.txt
index 832fb6c8..a00af07a 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20220801' into zouap
+merge