Projects >> atlas >>5d66d6b856b4bd1609bbe94ea2a9c41e210760e4

Chunk
Conflicting content 
import nu.xom.Element;

import org.atlasapi.media.entity.Content;
<<<<<<< HEAD
=======
import org.atlasapi.media.entity.CrewMember;
import org.atlasapi.media.entity.CrewMember.Role;
import org.atlasapi.media.entity.Encoding;
import org.atlasapi.media.entity.Location;
import org.atlasapi.media.entity.Policy;
import org.atlasapi.media.entity.Policy.RevenueContract;
import org.atlasapi.media.entity.Publisher;
import org.atlasapi.media.entity.Version;
import org.atlasapi.remotesite.AttributeNotFoundException;
import org.joda.time.Duration;
>>>>>>> 33f404e3d19e31f98c1f3a8c754aee4db60304f2

public interface NetflixContentExtractor {
Solution content 
import nu.xom.Element;

import org.atlasapi.media.entity.Content;
import org.atlasapi.media.entity.CrewMember;
import org.atlasapi.media.entity.CrewMember.Role;
import org.atlasapi.media.entity.Encoding;
import org.atlasapi.media.entity.Location;
import org.atlasapi.media.entity.Policy;
import org.atlasapi.media.entity.Policy.RevenueContract;
import org.atlasapi.media.entity.Publisher;
import org.atlasapi.media.entity.Version;
import org.atlasapi.remotesite.AttributeNotFoundException;
import org.joda.time.Duration;

public interface NetflixContentExtractor {
File
NetflixContentExtractor.java
Developer's decision
Version 2
Kind of conflict
Import