matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge typo

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-05-14 02:36:29 -04:00
parent 2e2797bba5
commit d338da5491
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mayan/apps/converter/classes.py
View File

@@ -141,7 +141,6 @@ class ConverterBase(object):
kwargs = {'_env': {'HOME': libreoffice_home_directory}} kwargs = {'_env': {'HOME': libreoffice_home_directory}}
<<<<<<< HEAD
if self.mime_type == 'text/plain': if self.mime_type == 'text/plain':
kwargs.update( kwargs.update(
{'infilter': 'Text (encoded):UTF8,LF,,,'} {'infilter': 'Text (encoded):UTF8,LF,,,'}
@@ -195,8 +194,6 @@ class ConverterBase(object):
temporary_converted_file_object.seek(0) temporary_converted_file_object.seek(0)
return temporary_converted_file_object return temporary_converted_file_object
=======
>>>>>>> 60c0c131ae5aa2d4614e2f1bab0b78c67cb1a484
def to_pdf(self): def to_pdf(self):
if self.mime_type in CONVERTER_OFFICE_FILE_MIMETYPES: if self.mime_type in CONVERTER_OFFICE_FILE_MIMETYPES:
return self.soffice() return self.soffice()