Projects >> sockso >>0bde1ab9ac1584f782c3f3d90ae63aefda0a6e7f

Chunk
Conflicting content 
                    removeTrack( evt.getFileId() );
                    break;

<<<<<<< HEAD
                case IndexEvent.COMPLETE:
                    removeOrphans();
=======
                case COMPLETE:
                    removeEmptyArtistsAndAlbums();
>>>>>>> 00fc5f5236ff18caa2d205337ebc20c854ce1640
                    fireCollectionManagerEvent( CollectionManagerListener.UPDATE_COMPLETE, "Collection Updated!" );
                    break;
Solution content 
                    removeTrack( evt.getFileId() );
                    break;

                case COMPLETE:
                    removeEmptyArtistsAndAlbums();
                    fireCollectionManagerEvent( CollectionManagerListener.UPDATE_COMPLETE, "Collection Updated!" );
                    break;
File
DBCollectionManager.java
Developer's decision
Version 2
Kind of conflict
Case statement
Method invocation