Mercurial Repositories > eric / file diff

diff -r 7b0e38956b5c -r 5c1a96925da4 Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
--- a/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Tue Dec 29 18:59:46 2015 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Fri Jan 01 12:12:12 2016 +0100
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2014 - 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2014 - 2016 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 
 """