LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge error

This commit is contained in:
Felix Geisendörfer 2013-03-18 17:37:00 +01:00
parent 44d3e7bc14
commit 34d69e6937
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -134,13 +134,8 @@ Range: bytes=0-20,40-99
The `Range` header holds a [byte
range](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.1) that
<<<<<<< HEAD
informs the client which parts of the file have been received so far. It is
up to the client to choose appropiate `PUT` requests to complete the upload.
=======
informs the client which parts of the file have #not# been received yet. It is
up to the client to choose appropriate `PUT` requests to complete the upload.
>>>>>>> read me updates
A completed upload will be indicated by a single range covering the entire file
size (e.g. `Range: bytes=0-99` for a 100 byte file).