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

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

diff --git a/src/test.txt b/src/test.txt
index de57b1df..2fe8528b 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-解决回车换行符号
+Merge branch 'zouap' of https://git.openi.org.cn/OpenI/aiforge into zouap