Update copyright years.

[toast/confclerk.git] / src / gui / conflictdialogcontainer.cpp

diff --git a/src/gui/conflictdialogcontainer.cpp b/src/gui/conflictdialogcontainer.cpp
index 512845f4a250db8a2ac87359097d260c319a06fb..1bdb523305828a4f4d995aa2a4cf0e3449b3f71c 100644 (file)
--- a/src/gui/conflictdialogcontainer.cpp
+++ b/src/gui/conflictdialogcontainer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann
  *
  * This file is part of ConfClerk.
  *