branch | jv |
changeset 1095 | 87f223484bc3 |
parent 690 | e6399c739a30 |
--- a/MCThreeWayMerger.st Mon Jul 02 08:46:02 2018 +0200 +++ b/MCThreeWayMerger.st Wed Nov 14 12:57:13 2018 +0100 @@ -1,3 +1,5 @@ +"{ Encoding: utf8 }" + "{ Package: 'stx:goodies/monticello' }" MCMerger subclass:#MCThreeWayMerger @@ -156,5 +158,5 @@ ! version_SVN - ^ '§Id: MCThreeWayMerger.st 17 2010-10-13 12:07:52Z vranyj1 §' + ^ '§Id: MCThreeWayMerger.st 17 2010-10-13 12:07:52Z vranyj1 §' ! !