From 7a88f817400ff4c88780a546a1519720247305a2 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:04 +0800
Subject: [PATCH] Merge branch 'V20220830' into fix-2392

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

diff --git a/src/test.txt b/src/test.txt
index 7f7ae395..00c04cf9 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge remote-tracking branch 'origin/V20220830' into zouap_static
+Merge branch 'V20220830' into fix-2392