Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2020-06-12 22:42:46 +02:00
commit c5e4ba601d
5 changed files with 191 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
docs/source/conf.py
View file

@ -20,10 +20,17 @@ if not _no_autodoc:
GAME_DIR = os.environ.get("EVGAMEDIR")
if not (EV_ROOT and GAME_DIR):
<<<<<<< HEAD
err = ("The EVDIR and EVGAMEDIR environment variables must be set to "
"the absolute paths to the evennia/ repo and an initialized "
"evennia gamedir respectively.")
raise RuntimeError(err)
=======
print("The EVDIR and EVGAMEDIR environment variables must be set to "
"the absolute paths to the evennia/ repo and an initialized "
"evennia gamedir respectively.")
raise RuntimeError()
>>>>>>> master
print("Evennia root: {}, Game dir: {}".format(EV_ROOT, GAME_DIR))
@ -48,7 +55,11 @@ copyright = '2020, The Evennia developer community'
author = 'The Evennia developer community'
# The full version, including alpha/beta/rc tags
<<<<<<< HEAD
release = '1.0-dev'
=======
release = '0.9.1'
>>>>>>> master
# -- General configuration ---------------------------------------------------
@ -140,10 +151,15 @@ html_theme = 'alabaster'
# sphinx-multiversion config
smv_tag_whitelist = r"^$"
<<<<<<< HEAD
smv_branch_whitelist = r"^master$|^develop$"
# 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_branch_whitelist = r"^master$|^v1.0$"
>>>>>>> master
smv_outputdir_format = "versions" + sep + "{config.release}"