Fix syntax error

This commit is contained in:
Lukas Reschke 2016-06-12 19:05:05 +02:00
parent 46de00be85
commit bc3f64bf14
No known key found for this signature in database
GPG Key ID: 9AB0ADB949B6898C

View File

@ -204,12 +204,7 @@ latex_logo = '../_shared_assets/static/logo-blue.pdf'
#latex_domain_indices = True
# -- Options for pdf page output -----------------------------------------------
<<<<<<< HEAD
pdf_documents = [('contents', u'nextcloud Server Administration Manual', u'Nextcloud Server Administration Manual', u'The Nextcloud developers'),]
=======
pdf_documents = [('contents', u'Nextcloud Server Administration Manual', u'Nextcloud Server Administration Manual', u'The Nextcloud developers'),]
>>>>>>> stable9
# -- Options for manual page output --------------------------------------------