fix merge

10 months ago · 5db92c11e4
1 changed files with 1 additions and 0 deletions
--- a/weed/operation/upload_content.go
+++ b/weed/operation/upload_content.go
@ -268,6 +268,7 @@ func doUploadData(data []byte, option *UploadOption) (uploadResult *UploadResult
 			PairMap:           option.PairMap,
 			Jwt:               option.Jwt,
 			Md5:               option.Md5,
 			BytesBuffer:       option.BytesBuffer,
 		})
 		if uploadResult == nil {
 			return