branch | jv |
changeset 995 | 92bb466548a9 |
parent 581 | b4b6e5438c90 |
child 1121 | c5661215109c |
--- a/MCMergeBrowser.st Thu Apr 30 21:53:12 2015 +0200 +++ b/MCMergeBrowser.st Sun May 10 05:53:16 2015 +0100 @@ -1,5 +1,7 @@ "{ Package: 'stx:goodies/monticello' }" +"{ NameSpace: Smalltalk }" + MCPatchBrowser subclass:#MCMergeBrowser instanceVariableNames:'conflicts merger ok' classVariableNames:'' @@ -153,3 +155,4 @@ version ^ '$Header: /cvs/stx/stx/goodies/monticello/MCMergeBrowser.st,v 1.2 2012-09-11 21:12:50 cg Exp $' ! ! +