diff --git a/src/test.txt b/src/test.txt index d1442b22..cf26ec58 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge pull request '云脑1和云脑2调试任务创建和显示合一和缺省页的显示以及权限设定' (#1077) from liuzx_trainjob into V20211213 +Merge branch 'liuzx_trainjob' of https \ No newline at end of file