Projects >> atlas-client >>5ece98d08b1cc144cf4d198461baca6813282691

Chunk
Conflicting content 
import java.util.List;

import org.atlasapi.client.query.AtlasQuery;
<<<<<<< HEAD
import org.atlasapi.media.entity.simple.ContentGroupQueryResult;
=======
import org.atlasapi.media.entity.Publisher;
>>>>>>> 77d4f9df128e3f8342234f49f1b0a46473c5c3ec
import org.atlasapi.media.entity.simple.ContentQueryResult;
import org.atlasapi.media.entity.simple.Description;
import org.atlasapi.media.entity.simple.DiscoverQueryResult;
Solution content 
import java.util.List;

import org.atlasapi.client.query.AtlasQuery;
import org.atlasapi.media.entity.simple.ContentGroupQueryResult;
import org.atlasapi.media.entity.Publisher;
import org.atlasapi.media.entity.simple.ContentQueryResult;
import org.atlasapi.media.entity.simple.Description;
import org.atlasapi.media.entity.simple.DiscoverQueryResult;
File
GsonAtlasClient.java
Developer's decision
Concatenation
Kind of conflict
Import