1 "{ Package: 'stx:goodies/monticello' }"

     3 "{ Package: 'stx:goodies/monticello' }"

     2 

     4 

     3 Object subclass:#MCConflict

     5 Object subclass:#MCConflict

     4 	instanceVariableNames:'operation chooseRemote'

     6 	instanceVariableNames:'operation chooseRemote'

     5 	classVariableNames:''

     7 	classVariableNames:''

   125 version_CVS

   127 version_CVS

   126     ^ '$Header: /cvs/stx/stx/goodies/monticello/MCConflict.st,v 1.4 2012-09-11 21:21:04 cg Exp $'

   128     ^ '$Header: /cvs/stx/stx/goodies/monticello/MCConflict.st,v 1.4 2012-09-11 21:21:04 cg Exp $'

   127 !

   129 !

   128 

   130 

   129 version_SVN

   131 version_SVN

   131 ! !

   133 ! !