Mercurial Repositories > eric / file diff
diff: Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 5389
- 9b1c800daff3
- parent 5250
- 2f22b20ea9ad
- child 5588
- 6ba512d9f46a
--- a/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Fri Dec 23 12:43:54 2016 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sat Dec 31 13:34:21 2016 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2016 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> # """
