changeset 274 | 176217c3971f |
parent 191 | f8afcf4b6f29 |
child 616 | a188c0e99a82 |
--- a/MCConflict.st Sat Aug 20 14:00:43 2011 +0200 +++ b/MCConflict.st Sat Aug 20 14:00:48 2011 +0200 @@ -118,8 +118,12 @@ !MCConflict class methodsFor:'documentation'! +version + ^ '$Header: /cvs/stx/stx/goodies/monticello/MCConflict.st,v 1.3 2011-08-20 12:00:48 cg Exp $' +! + version_CVS - ^ '$Header: /cvs/stx/stx/goodies/monticello/MCConflict.st,v 1.2 2011-08-20 11:41:16 cg Exp $' + ^ '$Header: /cvs/stx/stx/goodies/monticello/MCConflict.st,v 1.3 2011-08-20 12:00:48 cg Exp $' ! version_SVN