diff --git a/src/test.txt b/src/test.txt index e9c24c10..1a4a2fd8 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge pull request '实现分片上传、断点续传以及秒传等功能' (#49) from dev-chunk into develop +Merge branch 'develop' into dev-chunk