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

conflict fix

This commit is contained in:
tim-kos 2013-03-19 11:07:26 +01:00
parent 08745ff59a
commit dab46b60c9
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmd/tusd/http.go
View File

@ -88,12 +88,7 @@ func postFiles(w http.ResponseWriter, r *http.Request) {
} }
id := uid() id := uid()
<<<<<<< HEAD
if err := dataStore.CreateFile(id, contentRange.Size, contentType); err != nil { if err := dataStore.CreateFile(id, contentRange.Size, contentType); err != nil {
=======
if err := initFile(id, contentRange.Size, contentType); err != nil {
log.Print("FOO4")
>>>>>>> conflict fix
reply(w, http.StatusInternalServerError, err.Error()) reply(w, http.StatusInternalServerError, err.Error())
return return
} }