Fix merge conflicts

2019-01-01 15:19:20 +01:00 · 2019-01-01 15:19:20 +01:00 · 981119b640
commit 981119b640
parent 48f334d959 e016ba921e
89 changed files with 5435 additions and 818 deletions
--- a/evennia/init.py
+++ b/evennia/init.py
@ -105,7 +105,7 @@ def _create_version():
            "git rev-parse --short HEAD",
            shell=True, cwd=root, stderr=STDOUT).strip().decode()
        version = "%s (rev %s)" % (version, rev)
-    except (IOError, CalledProcessError):
+    except (IOError, CalledProcessError, OSError):
        # ignore if we cannot get to git
        pass
    return version