Imported Upstream version 0.6.0

[debian/confclerk.git] / src / gui / conflictdialogcontainer.h

diff --git a/src/gui/conflictdialogcontainer.h b/src/gui/conflictdialogcontainer.h
index b7dad73045b089c881540a72d12ad1ec96c0cff3..99f1f3c40499e4907609717b0362c350e25cdeab 100644 (file)
--- a/src/gui/conflictdialogcontainer.h
+++ b/src/gui/conflictdialogcontainer.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *