[ENH] DropFilesOnArchiveViewer-as-nk ( conflicts )

denker at iam.unibe.ch denker at iam.unibe.ch
Sun Nov 14 01:00:34 CET 2004


The changeset DropFilesOnArchiveViewer-as-nk.cs has conflicts with later
changes.


Checking DropFilesOnArchiveViewer-as-nk.cs (#5878) for method conflicts
with changesets after 5878hScrollbarFixes2-sps ...
...checking ArchiveViewer>>addMember
...checking ArchiveViewer>>createButtonBar
CONFLICT found for ArchiveViewer class>>createButtonBar with newer
changesets 5994-004-systemMod 6003-1007mergeJul2 6023-3021misc
6111-0290fontMenuFixes-nk 6222MoreWindowColorFixes-nk
...checking ArchiveViewer>>addDirectory
...checking ArchiveViewer>>memberMenu:shifted:
CONFLICT found for ArchiveViewer class>>memberMenu:shifted: with newer
changeset 5948ServicesArchiveViewer-nk
...checking Archive>>addTree:removingFirstCharacters:
2 conflicts found.


More information about the Squeak-harvest mailing list