diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /regtests/LICENSE | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'regtests/LICENSE')
-rw-r--r-- | regtests/LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regtests/LICENSE b/regtests/LICENSE index 4d9210d10e1..fb9f046cc43 100644 --- a/regtests/LICENSE +++ b/regtests/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016, MAME Development Team +Copyright (c) 2019, MAME Development Team All rights reserved. Redistribution and use in source and binary forms, with or without |