Projects >> atlas >>023680dab94d2036bd0206b98baa663fa16d3a83

Chunk
Conflicting content 
import org.atlasapi.media.entity.ParentRef;
import org.atlasapi.media.entity.Person;
import org.atlasapi.media.entity.ReleaseDate;
<<<<<<< HEAD
=======
import org.atlasapi.persistence.content.people.QueuingItemsPeopleWriter;
>>>>>>> 27a90cbf1a343157b4c56bac68df3a657980928d
import org.atlasapi.persistence.content.people.QueuingPersonWriter;
import org.atlasapi.remotesite.ContentExtractor;
import org.atlasapi.remotesite.bbc.BbcFeeds;
Solution content 
import org.atlasapi.media.entity.ParentRef;
import org.atlasapi.media.entity.Person;
import org.atlasapi.media.entity.ReleaseDate;
import org.atlasapi.persistence.content.people.QueuingPersonWriter;
import org.atlasapi.remotesite.ContentExtractor;
import org.atlasapi.remotesite.bbc.BbcFeeds;
File
NitroEpisodeExtractor.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.metabroadcast.atlas.glycerin.model.Synopses;
import com.metabroadcast.common.time.Clock;
import org.joda.time.LocalDate;
<<<<<<< HEAD
import org.springframework.beans.factory.annotation.Value;
=======
>>>>>>> 27a90cbf1a343157b4c56bac68df3a657980928d

import javax.xml.datatype.XMLGregorianCalendar;
Solution content 
import com.metabroadcast.atlas.glycerin.model.Synopses;
import com.metabroadcast.common.time.Clock;
import org.joda.time.LocalDate;
import org.springframework.beans.factory.annotation.Value;

import javax.xml.datatype.XMLGregorianCalendar;
File
NitroEpisodeExtractor.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        }
        item.setParentRef(getBrandRef(episode));
        item.setGenres(genresExtractor.extract(source.getGenres()));
<<<<<<< HEAD
        if (releaseDateIngestIsEnabled && episode.getReleaseDate() != null) {
=======
        if (episode.getReleaseDate() != null) {
>>>>>>> 27a90cbf1a343157b4c56bac68df3a657980928d
            setReleaseDate(item, source);
        }
        writeAndSetPeople(item, source);
Solution content 
        }
        item.setParentRef(getBrandRef(episode));
        item.setGenres(genresExtractor.extract(source.getGenres()));
        if (releaseDateIngestIsEnabled && episode.getReleaseDate() != null) {
            setReleaseDate(item, source);
        }
        writeAndSetPeople(item, source);
File
NitroEpisodeExtractor.java
Developer's decision
Version 1
Kind of conflict
If statement