diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /docs/source/license.rst | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'docs/source/license.rst')
-rw-r--r-- | docs/source/license.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/source/license.rst b/docs/source/license.rst index 9e61b9ca349..db2eb2f41d0 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-2018 MAMEDev and contributors + Copyright (C) 1997-2019 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 |