github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-26 07:21:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix postmerge issue

Browse source
This commit is contained in:
Xavier Trochu 2015-11-05 12:11:02 +01:00
parent a367190a21
commit 63aef6b832
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/filestore/app/coffee/FileHandler.coffee
View file

@ -60,19 +60,12 @@ module.exports =
], (err)-> ], (err)->
if err? if err?
return callback(err) return callback(err)
<<<<<<< HEAD
PersistorManager.getFileStream bucket, convertedKey, callback PersistorManager.getFileStream bucket, convertedKey, callback
_convertFile: (bucket, originalKey, opts, callback)-> _convertFile: (bucket, originalKey, opts, callback)->
@_writeS3FileToDisk bucket, originalKey, (err, originalFsPath)-> @_writeS3FileToDisk bucket, originalKey, (err, originalFsPath)->
=======
PersistorManager.getFileStream bucket, convetedKey, opts, callback
_convertFile: (bucket, origonalKey, opts, callback)->
@_writeS3FileToDisk bucket, origonalKey, opts, (err, origonalFsPath)->
if err? if err?
return callback(err) return callback(err)
>>>>>>> sharelatex/master
done = (err, destPath)-> done = (err, destPath)->
if err? if err?
logger.err err:err, bucket:bucket, originalKey:originalKey, opts:opts, "error converting file" logger.err err:err, bucket:bucket, originalKey:originalKey, opts:opts, "error converting file"