mirrors/nextcloud-documentation
3
0
Fork 0
mirror of https://github.com/nextcloud/documentation.git synced 2025-10-26 11:18:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix syntax error

Browse Source
This commit is contained in:
Lukas Reschke 2016-06-12 19:05:39 +02:00
parent bc3f64bf14
commit da72242526
No known key found for this signature in database
GPG Key ID: 9AB0ADB949B6898C
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin_manual/conf.py
View File

@ -237,15 +237,9 @@ texinfo_documents = [ ('contents', 'Nextcloud Server Admin Manual', u'Nextcloud
# Bibliographic Dublin Core info.
epub_title = u'Nextcloud Server Administration Manual'
<<<<<<< HEAD
epub_author = u'The Nextcloud developers'
epub_publisher = u'The Nextcloud developers'
epub_copyright = u'2012-2016, The Nextcloud developers'
=======
epub_author = u'The ownCloud developers'
epub_publisher = u'The ownCloud developers'
epub_copyright = u'2016, The ownCloud developers'
>>>>>>> stable9
epub_copyright = u'2016, The Nextcloud developers'
# The language of the text. It defaults to the language option
# or en if the language is not set.