diff options
| author | Jim Meyering <jim@meyering.net> | 2007-01-26 11:13:44 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-01-26 11:13:44 +0100 |
| commit | cece28a8bc805789bba926b928d3fe61488b8a07 (patch) | |
| tree | 4cbf0d1a3196437f90d6f47d7be0b2ed1afc835d | |
| parent | 94986c1d0a35fa233ab80fe65fb6e3e93a8c2196 (diff) | |
| download | coreutils-cece28a8bc805789bba926b928d3fe61488b8a07.tar.xz | |
merge copyright line conflict
| -rw-r--r-- | tests/cp/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/cp/Makefile.am b/tests/cp/Makefile.am index d138b35a2..8c978ee42 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 |