From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- docs/source/license.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/source/license.rst') 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 -- cgit v1.2.3-70-g09d2