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