From e8285f0917fa5bb53058b4e590cde0257228ed05 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20221130' into zouap

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

diff --git a/src/test.txt b/src/test.txt
index 3e44c2b8..7171c0d4 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-fix-3262
+Merge remote-tracking branch 'origin/V20221130' into zouap