From: Jim Meyering <jim@meyering.net>
Date: Fri, 26 Jan 2007 10:13:44 +0000 (+0100)
Subject: merge copyright line conflict
X-Git-Tag: v6.9.89~365
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cece28a8bc805789bba926b928d3fe61488b8a07;p=thirdparty%2Fcoreutils.git

merge copyright line conflict
---

diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am
index d138b35a21..8c978ee421 100644
--- 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