mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
merge copyright line conflict
This commit is contained in:
1 parent
94986c1d0a
commit
cece28a8bc
1 file changed
+1
-2
@@ -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
|
||||
|
||||
Reference in new issue
Block a user