From c0a5d5ebc3c98ae33414631970a73c4082aef066 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:44 +0800
Subject: [PATCH] Merge branch 'zouap_static' of 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 e135cb23..563978f9 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-解决冲突
+Merge branch 'zouap_static' of git.openi.org.cn:OpenI/aiforge into zouap_static