Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-25 17:26:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2020-06-13 10:45:46 +02:00
commit ce18d714de
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/source/conf.py
View file

@ -143,8 +143,7 @@ smv_tag_whitelist = r"^$"
# which branches to include in multi-version docs
# - master, develop and vX.X branches
smv_branch_whitelist = r"^master$|^develop$|^v[0-9\.]+?$"
# smv_branch_whitelist = r"^static-file-docs$|^static-file-dev$"
smv_outputdir_format = "versions" + sep + "{config.release}"
smv_outputdir_format = "{config.release}"
# recommonmark