Projects >> atlas >>1d5bc40b4d140a390764fe960584393d5314b806

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.space.TheSpaceModule;
import org.atlasapi.remotesite.music.emipub.EmiPubModule;
import org.atlasapi.remotesite.music.musicbrainz.MusicBrainzModule;
>>>>>>> 8e3af742a70b56da4a5c2385bb7adff3968df779

public class RemoteSiteModuleConfigurer {
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.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.space.TheSpaceModule;
import org.atlasapi.remotesite.music.emipub.EmiPubModule;
import org.atlasapi.remotesite.music.musicbrainz.MusicBrainzModule;
>>>>>>> mbst-1826-c4-ids

public class RemoteSiteModuleConfigurer {
File
RemoteSiteModuleConfigurer.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
        .put("thespace", TheSpaceModule.class)
        .put("musicbrainz", MusicBrainzModule.class)
        .put("emipub", EmiPubModule.class)
<<<<<<< HEAD
        .put("metabroadcast", MetaBroadcastModule.class)
=======
>>>>>>> 8e3af742a70b56da4a5c2385bb7adff3968df779
    .build();

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

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