summaryrefslogtreecommitdiffstatshomepage
path: root/regtests/LICENSE
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 /regtests/LICENSE
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'regtests/LICENSE')
-rw-r--r--regtests/LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/regtests/LICENSE b/regtests/LICENSE
index fb9f046cc43..4d9210d10e1 100644
--- a/regtests/LICENSE
+++ b/regtests/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019, MAME Development Team
+Copyright (c) 2016, MAME Development Team
All rights reserved.
Redistribution and use in source and binary forms, with or without