Projects >> atlas >>6aa3604b946bd85f61cbf5e81194c93e91bc1f3c

Chunk
Conflicting content 
import com.metabroadcast.common.properties.Parameter;
import org.atlasapi.remotesite.bbc.products.BBCProductsModule;
import org.atlasapi.remotesite.lovefilm.LoveFilmModule;
<<<<<<< HEAD
import org.atlasapi.remotesite.music.emipub.EmiPubModule;
import org.atlasapi.remotesite.music.musicbrainz.MusicBrainzModule;
import org.atlasapi.remotesite.metabroadcast.MetaBroadcastModule;
import org.atlasapi.remotesite.space.TheSpaceModule;
=======
import org.atlasapi.remotesite.music.emimusic.EmiMusicModule;
>>>>>>> 377e6e09ed4e935cee903a06e4879316b5b77346
import org.atlasapi.remotesite.space.TheSpaceModule;
import org.atlasapi.remotesite.music.emipub.EmiPubModule;
import org.atlasapi.remotesite.music.musicbrainz.MusicBrainzModule;
Solution content 
import com.metabroadcast.common.properties.Parameter;
import org.atlasapi.remotesite.bbc.products.BBCProductsModule;
import org.atlasapi.remotesite.lovefilm.LoveFilmModule;
import org.atlasapi.remotesite.metabroadcast.MetaBroadcastModule;
import org.atlasapi.remotesite.music.emimusic.EmiMusicModule;
import org.atlasapi.remotesite.space.TheSpaceModule;
import org.atlasapi.remotesite.music.emipub.EmiPubModule;
import org.atlasapi.remotesite.music.musicbrainz.MusicBrainzModule;
File
RemoteSiteModuleConfigurer.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        .put("thespace", TheSpaceModule.class)
        .put("musicbrainz", MusicBrainzModule.class)
        .put("emipub", EmiPubModule.class)
<<<<<<< HEAD
        .put("metabroadcast", MetaBroadcastModule.class)
=======
        .put("emimusic", EmiMusicModule.class)
>>>>>>> 377e6e09ed4e935cee903a06e4879316b5b77346
    .build();

    public Iterable> enabledModules() {
Solution content 
        .put("thespace", TheSpaceModule.class)
        .put("musicbrainz", MusicBrainzModule.class)
        .put("emipub", EmiPubModule.class)
        .put("metabroadcast", MetaBroadcastModule.class)
        .put("emimusic", EmiMusicModule.class)
    .build();

    public Iterable> enabledModules() {
File
RemoteSiteModuleConfigurer.java
Developer's decision
Concatenation
Kind of conflict
Other