From a972f9b619f58d5254660d2c450c9b8f1e7c0673 Mon Sep 17 00:00:00 2001
From: linlu <527100546@qq.com>
Date: Tue, 14 Mar 2023 17:50:59 +0800
Subject: [PATCH] Merge branch 'feature_ide_20221214' of
 https://git.pcl.ac.cn/wangwei10061/aiforge into feature_ide_20221214

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

diff --git a/src/test.txt b/src/test.txt
index 840f770b..a66a2588 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-注释mock和oss，记得上线删除
+Merge branch 'feature_ide_20221214' of https://git.pcl.ac.cn/wangwei10061/aiforge into feature_ide_20221214