From 9eaf5310c6919164be0629630336cae5d5b83dc2 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:51:30 +0800
Subject: [PATCH] Merge branch 'zouap_static' of openi.pcl.ac.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..4e4b5ad9 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-增加代码，解决Bug
+Merge branch 'zouap_static' of openi.pcl.ac.cn:OpenI/aiforge into zouap_static