From c19be771b88af5b146b5334a60cc11ed4b0e864a Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:38:01 +0800
Subject: [PATCH] Merge branch 'res-manage' into res-manage-v2

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

diff --git a/src/test.txt b/src/test.txt
index 05562c63..846a245e 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '检测用户是否有运行中的任务时，增加stopping状态' (#2783) from fix-2643 into V20220830
+Merge branch 'res-manage' into res-manage-v2