From 63aef6b832cf080ca8cc9d662eeff94f9418a60b Mon Sep 17 00:00:00 2001
From: Xavier Trochu <xavier.trochu@edpsciences.org>
Date: Thu, 5 Nov 2015 12:11:02 +0100
Subject: [PATCH] Fix postmerge issue

---
 services/filestore/app/coffee/FileHandler.coffee | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/services/filestore/app/coffee/FileHandler.coffee b/services/filestore/app/coffee/FileHandler.coffee
index b11036465a..a0e80dde71 100644
--- a/services/filestore/app/coffee/FileHandler.coffee
+++ b/services/filestore/app/coffee/FileHandler.coffee
@@ -60,19 +60,12 @@ module.exports =
 		], (err)->
 			if err?
 				return callback(err)
-<<<<<<< HEAD
 			PersistorManager.getFileStream bucket, convertedKey, callback
 
 	_convertFile: (bucket, originalKey, opts, callback)->
 		@_writeS3FileToDisk bucket, originalKey, (err, originalFsPath)->
-=======
-			PersistorManager.getFileStream bucket, convetedKey, opts, callback
-
-	_convertFile: (bucket, origonalKey, opts, callback)->
-		@_writeS3FileToDisk bucket, origonalKey, opts, (err, origonalFsPath)->
 			if err?
 				return callback(err)
->>>>>>> sharelatex/master
 			done = (err, destPath)->
 				if err?
 					logger.err err:err, bucket:bucket, originalKey:originalKey, opts:opts, "error converting file"