[FIX] TextEmphasisMagicNumberCleanup-fbs ( conflict )

denker at iam.unibe.ch denker at iam.unibe.ch
Sun Oct 31 19:10:33 CET 2004


Checking TextEmphasisMagicNumberCleanup-fbs.cs (#5707) for method
conflicts with changesets after 5707KCP198Browser ...
...checking PreferencesPanel>>adjustProjectLocalEmphasisFor:
...checking Preference>>representativeButtonWithColor:inPanel:
CONFLICT found for Preference
class>>representativeButtonWithColor:inPanel: with newer changesets
6263PrefViews-hpt 6272PrefViewsRegistry-hpt
...checking SyntaxMorph>>blockNodeCollect:arguments:statements:
...checking SyntaxMorph>>addBlockArg:
...checking SyntaxMorph>>attachTileForCode:nodeType:
...checking SyntaxMorph>>alanKwdSetter2:isAConditional:key:args:
...checking SyntaxMorph>>alanUnaryGetter:key:
...checking SyntaxMorph>>addTempVar:
...checking SyntaxMorph>>addToken:type:on:
...checking SyntaxMorph>>returnNode:expression:
...checking SyntaxMorph>>addTemporaries:
...checking SyntaxMorph>>alanKwdSetter:isAConditional:key:args:
1 conflict found.


More information about the Squeak-harvest mailing list