Skip to content
GitLab
Commit 91bcc4c0 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Resolved conflict.

parent 58245677
Hide whitespace changes
Inline Side-by-side
doc/src/conf.py
View file @ 91bcc4c0
...@@ -81,11 +81,7 @@ language = None ...@@ -81,11 +81,7 @@ language = None
# There are two options for replacing |today|: either, you set today to some # There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used: # non-false value, then it is used:
# #
<<<<<<< HEAD
today = 'Fri Mar 11 2022'
=======
today = 'Tue Sep 06 2022' today = 'Tue Sep 06 2022'
>>>>>>> cfitsio
# #
# Else, today_fmt is used as the format for a strftime call. # Else, today_fmt is used as the format for a strftime call.
# #
...@@ -148,11 +144,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] ...@@ -148,11 +144,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
# The name for this set of Sphinx documents. # The name for this set of Sphinx documents.
# "<project> v<release> documentation" by default. # "<project> v<release> documentation" by default.
# #
<<<<<<< HEAD
# html_title = u'SExtractor v2.25.3'
=======
# html_title = u'SExtractor v2.27.0' # html_title = u'SExtractor v2.27.0'
>>>>>>> cfitsio
# A shorter title for the navigation bar. Default is the same as html_title. # A shorter title for the navigation bar. Default is the same as html_title.
# #
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment