From 7d39ab30fb6c4529a116a533f27a9b114e80c48e Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:39:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/V20220601' into zouap

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

diff --git a/src/test.txt b/src/test.txt
index 31cee05c..0cdee6f0 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '捕获异常，忽略文件不存在错误。' (#2211) from zouap into V20220601
+Merge remote-tracking branch 'origin/V20220601' into zouap