From 0a812e0d70d4a409bf6b439f33cd8bac93b9aed2 Mon Sep 17 00:00:00 2001
From: lewis <747342561@qq.com>
Date: Tue, 14 Mar 2023 17:52:06 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=80=E6=9C=9F'=20(#2780)=20from=20res-ma?=
 =?UTF-8?q?nage=20into=20V20220830?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test.txt b/src/test.txt
index 7b5440e1..6da3eecc 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'V20220830' of git.openi.org.cn:OpenI/aiforge into cd-notebook
+Merge pull request '资源管理一期' (#2780) from res-manage into V20220830