From d1c74cfa347c7d1c4ec933aa1afee68a94842cb7 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:30 +0800
Subject: [PATCH] Merge branch 'zouap_static' of
 https://git.openi.org.cn/OpenI/aiforge into zouap_static

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

diff --git a/src/test.txt b/src/test.txt
index c17bbf61..a5609d69 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-增加代码，解决Bug
+Merge branch 'zouap_static' of https://git.openi.org.cn/OpenI/aiforge into zouap_static