summaryrefslogtreecommitdiffstatshomepage
path: root/docs/source/license.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/license.rst
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'docs/source/license.rst')
-rw-r--r--docs/source/license.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/source/license.rst b/docs/source/license.rst
index db2eb2f41d0..9e61b9ca349 100644
--- a/docs/source/license.rst
+++ b/docs/source/license.rst
@@ -6,7 +6,7 @@ The MAME project as a whole is distributed under the terms of the `GNU General P
Please note that MAME is a registered trademark of Gregory Ember, and permission is required to use the "MAME" name, logo, or wordmark.
- Copyright (C) 1997-2019 MAMEDev and contributors
+ Copyright (C) 1997-2018 MAMEDev and contributors
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by