summaryrefslogtreecommitdiffstatshomepage
path: root/docs/source/whatis.rst
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /docs/source/whatis.rst
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'docs/source/whatis.rst')
-rw-r--r--docs/source/whatis.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/source/whatis.rst b/docs/source/whatis.rst
index 51f9d244226..fb5dffe497b 100644
--- a/docs/source/whatis.rst
+++ b/docs/source/whatis.rst
@@ -7,7 +7,7 @@ MAME's purpose is to preserve decades of software history. As electronic technol
|
| **MAME®**
-| **Copyright © 1997-2019 by Nicola Salmoria and the MAME team**
+| **Copyright © 1997-2018 by Nicola Salmoria and the MAME team**
| **MAME is a registered trademark owned by Gregory Ember**
|