Skip to content

Commit 1fa7df5

Browse files
author
zhangheng
committed
resolve conflict
2 parents ddb7391 + 7e07e59 commit 1fa7df5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/upload.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export class UploadManager {
202202
let shouldCheckMD5 = this.config.checkByMD5;
203203
let reuseSaved = () => {
204204
this.updateChunkProgress(chunk.size, index);
205-
this.ctxList[index] = { ctx: info.ctx, time: info.time, md5: info.md5 };
205+
this.ctxList[index] = {ctx: info.ctx, size: info.size, time: info.time, md5: info.md5};
206206
return Promise.resolve(null);
207207
};
208208

0 commit comments

Comments
 (0)