mirror of
https://github.com/corda/corda.git
synced 2025-02-17 16:10:47 +00:00
Merge OS 4.1 into OS 4.3
Fixed missed conflict in conf.py
This commit is contained in:
parent
e5f314ffbf
commit
9661f8d4e4
@ -148,16 +148,6 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
|
|||||||
# Theme options are theme-specific and customize the look and feel of a theme
|
# Theme options are theme-specific and customize the look and feel of a theme
|
||||||
# further. For a list of options available for each theme, see the
|
# further. For a list of options available for each theme, see the
|
||||||
# documentation.
|
# documentation.
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
html_theme_options = {
|
|
||||||
'includehidden':True,
|
|
||||||
'collapse_navigation':False,
|
|
||||||
'sticky_navigation':True,
|
|
||||||
'titles_only':True
|
|
||||||
}
|
|
||||||
>>>>>>> release/4
|
|
||||||
|
|
||||||
html_theme_options = {
|
html_theme_options = {
|
||||||
'includehidden':True,
|
'includehidden':True,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user