From 53f32d9f8cb27b08b7162d0c967e8072debfa3af Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:37:35 +0800
Subject: [PATCH] Merge branch 'zouap_static' of git.openi.org.cn

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

diff --git a/src/test.txt b/src/test.txt
index e135cb23..8f183fda 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-解决冲突
+Merge branch 'zouap_static' of git.openi.org.cn
\ No newline at end of file