diff --git a/main.go b/main.go
index fc76751..0ff6a60 100755
--- a/main.go
+++ b/main.go
@@ -317,4 +317,3 @@ func setContentTypeIfMedia(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/x-tar")
 	}
 }
->>>>>>> 66a35fcf10990bd0cd452a9eb7561b22581d250d