From 5a3866d6b3eb56910a025a3faabdec3a0bc7d96b Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:17 +0800
Subject: [PATCH] Merge branch 'res-manage' of git.openi.org.cn:OpenI/aiforge
 into res-manage

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

diff --git a/src/test.txt b/src/test.txt
index 9c825fd0..075d0e40 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修改#2702
+Merge branch 'res-manage' of git.openi.org.cn:OpenI/aiforge into res-manage