mirror of
https://github.com/Start9Labs/documentation.git
synced 2026-03-30 12:11:57 +00:00
?
This commit is contained in:
@@ -35,13 +35,10 @@ templates_path = ['_templates']
|
|||||||
|
|
||||||
# HTML sidebar widgets
|
# HTML sidebar widgets
|
||||||
# html_sidebars = {
|
# html_sidebars = {
|
||||||
<<<<<<< HEAD
|
|
||||||
# "**": ["versioning.html"],
|
# "**": ["versioning.html"],
|
||||||
=======
|
|
||||||
# '**': [
|
# '**': [
|
||||||
# 'versioning.html',
|
# 'versioning.html',
|
||||||
# ],
|
# ],
|
||||||
>>>>>>> c566da4 (Versioning init)
|
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# List of patterns, relative to source directory, that match files and
|
# List of patterns, relative to source directory, that match files and
|
||||||
@@ -50,7 +47,6 @@ templates_path = ['_templates']
|
|||||||
exclude_patterns = []
|
exclude_patterns = []
|
||||||
|
|
||||||
# Multiversion settings
|
# Multiversion settings
|
||||||
<<<<<<< HEAD
|
|
||||||
# smv_tag_whitelist = None
|
# smv_tag_whitelist = None
|
||||||
# smv_branch_whitelist = None
|
# smv_branch_whitelist = None
|
||||||
# smv_prefer_remote_refs = True
|
# smv_prefer_remote_refs = True
|
||||||
@@ -59,12 +55,10 @@ exclude_patterns = []
|
|||||||
# "v0.2.x" : "https://github.com/Start9Labs/documentation",
|
# "v0.2.x" : "https://github.com/Start9Labs/documentation",
|
||||||
# "v0.3.x" : "https://github.com/Start9Labs/documentation/tree/docs-updates"
|
# "v0.3.x" : "https://github.com/Start9Labs/documentation/tree/docs-updates"
|
||||||
# }
|
# }
|
||||||
=======
|
|
||||||
smv_tag_whitelist = 'None'
|
smv_tag_whitelist = 'None'
|
||||||
smv_prefer_remote_refs = True
|
smv_prefer_remote_refs = True
|
||||||
# smv_branch_whitelist = master
|
# smv_branch_whitelist = master
|
||||||
|
|
||||||
>>>>>>> c566da4 (Versioning init)
|
|
||||||
|
|
||||||
# -- Options for HTML output -------------------------------------------------
|
# -- Options for HTML output -------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user