summaryrefslogtreecommitdiff
path: root/conflictcheck.c
diff options
context:
space:
mode:
Diffstat (limited to 'conflictcheck.c')
-rw-r--r--conflictcheck.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/conflictcheck.c b/conflictcheck.c
index 28a8cfa..2a6ff87 100644
--- a/conflictcheck.c
+++ b/conflictcheck.c
@@ -1,5 +1,5 @@
/* -*- c++ -*-
-Copyright (C) 2004-2011 Christian Wieninger
+Copyright (C) 2004-2012 Christian Wieninger
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License