From 407c2f0ed25608215507f09705ab6fb5c7e845d5 Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:37:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zouap_static' into
 fix-2833

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

diff --git a/src/test.txt b/src/test.txt
index 3ff7b26b..5ed07850 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20220908' of git.openi.org.cn
\ No newline at end of file
+Merge remote-tracking branch 'origin/zouap_static' into fix-2833