From dab46b60c9551d34a7bfb29d2d10b427017a9706 Mon Sep 17 00:00:00 2001
From: tim-kos <tim@debuggable.com>
Date: Tue, 19 Mar 2013 11:07:26 +0100
Subject: [PATCH] conflict fix

---
 src/cmd/tusd/http.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/cmd/tusd/http.go b/src/cmd/tusd/http.go
index 7afc3e7..37ae865 100644
--- a/src/cmd/tusd/http.go
+++ b/src/cmd/tusd/http.go
@@ -88,12 +88,7 @@ func postFiles(w http.ResponseWriter, r *http.Request) {
 	}
 
 	id := uid()
-<<<<<<< HEAD
 	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())
 		return
 	}