From 2c15bc5a29b75040857f63e3a52c2ad0ded5f3bd Mon Sep 17 00:00:00 2001
From: Jonny <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:41:49 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E5=88=86=E7=89=87=E4=B8=8A=E4=BC=A0=E3=80=81=E6=96=AD=E7=82=B9?=
 =?UTF-8?q?=E7=BB=AD=E4=BC=A0=E4=BB=A5=E5=8F=8A=E7=A7=92=E4=BC=A0=E7=AD=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD'=20(#49)=20from=20dev-chunk=20into=20develop?=
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 e4747696..e9c24c10 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge branch 'develop' into dev-cloudmain
+Merge pull request '实现分片上传、断点续传以及秒传等功能' (#49) from dev-chunk into develop