diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /docs/source/conf.py | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'docs/source/conf.py')
-rw-r--r-- | docs/source/conf.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/source/conf.py b/docs/source/conf.py index 4130e982e30..acc99a66fbd 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -32,7 +32,6 @@ extensions = [ 'sphinx.ext.mathjax', 'sphinx.ext.viewcode', 'edit_on_github', - 'sphinxcontrib.rsvgconverter' ] edit_on_github_project = 'mamedev/mame' @@ -55,16 +54,16 @@ master_doc = 'index' # General information about the project. project = u'MAME Documentation' -copyright = u'2019, MAMEdev Team' +copyright = u'2018, MAMEdev Team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.205' +version = '0.194' # The full version, including alpha/beta/rc tags. -release = '0.205' +release = '0.194' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |