Update copyright notices.

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

diff --git a/src/gui/conflictsdialog.cpp b/src/gui/conflictsdialog.cpp
index 74e66d19ca179670849fe4b0cf0f57158fd8cf7b..d153d3e8cb31214b56f374681321c9b5545ef889 100644 (file)
--- a/src/gui/conflictsdialog.cpp
+++ b/src/gui/conflictsdialog.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011 Philipp Spitzer, gregor herrmann
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *