summaryrefslogtreecommitdiff
path: root/tests/merge
diff options
context:
space:
mode:
Diffstat (limited to 'tests/merge')
-rw-r--r--tests/merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/merge b/tests/merge
index 5aee809..1059ed0 100644
--- a/tests/merge
+++ b/tests/merge
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# in any medium, are permitted without royalty provided the copyright