summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorGravatarGravatar andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committerGravatarGravatar andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch) (github)
tree63c8012e262618f08a332da31dd714281aa2c5ed /web
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
downloadmame-b380514764cf857469bae61c11143a19f79a74c5.tar.bz2
mame-b380514764cf857469bae61c11143a19f79a74c5.zip
Revert "conflict resolution (nw)"
Diffstat (limited to 'web')
-rw-r--r--web/LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/LICENSE b/web/LICENSE
index fb9f046cc43..844daf41951 100644
--- a/web/LICENSE
+++ b/web/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019, MAME Development Team
+Copyright (c) 2018, MAME Development Team
All rights reserved.
Redistribution and use in source and binary forms, with or without