ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-29 15:43:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge OS 4.1 into OS 4.3

Browse Source 
Fixed missed conflict in conf.py
This commit is contained in:
Jonathan Locke 2019-08-27 14:56:08 +01:00
parent e5f314ffbf
commit 9661f8d4e4
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/source/conf.py
View File

@ -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
# further. For a list of options available for each theme, see the
# documentation.
<<<<<<< HEAD
=======
html_theme_options = {
'includehidden':True,
'collapse_navigation':False,
'sticky_navigation':True,
'titles_only':True
}
>>>>>>> release/4
html_theme_options = {
'includehidden':True,