merge copyright line conflict

diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am
index d138b35a212d822f7767f98bccbbf599e84cd390..8c978ee421eb91ae54abf597ff6092219b2e4299 100644 (file)
--- a/tests/cp/Makefile.am
+++ b/tests/cp/Makefile.am
@@ -1,7 +1,6 @@
 # Make coreutils tests for cp.                         -*-Makefile-*-
 
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2005, 2006, 2007 Free
-# Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003, 2005-2007 Free Software Foundation, Inc.
 
 # 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