From bc3f64bf1403a87e01c3663cc0159fe0d7bb3509 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 12 Jun 2016 19:05:05 +0200 Subject: [PATCH] Fix syntax error --- admin_manual/conf.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/admin_manual/conf.py b/admin_manual/conf.py index aec519a41..3a2142752 100644 --- a/admin_manual/conf.py +++ b/admin_manual/conf.py @@ -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 --------------------------------------------