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. --- web/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web') 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 -- cgit v1.2.3