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/whatis.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/source/whatis.rst') 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** | -- cgit v1.2.3-70-g09d2