diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /README.md | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md index 100fe401a78..22d62f68ace 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ Please note that MAME is a registered trademark of Gregory Ember, and permission <img align="right" src="http://opensource.org/trademarks/opensource/OSI-Approved-License-100x137.png"> </a> - 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 |