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