Projects >> atlas-persistence >>4ab755b8672c46b9776049475e6e895bdadc7d64

Chunk
Conflicting content 
import org.atlasapi.persistence.content.ContentGroupResolver;
import org.atlasapi.persistence.content.ContentGroupWriter;
import org.atlasapi.persistence.content.listing.ContentLister;
<<<<<<< HEAD
import org.atlasapi.persistence.content.mongo.MongoContentGroupResolver;
import org.atlasapi.persistence.content.mongo.MongoContentGroupWriter;
=======
import org.atlasapi.persistence.content.mongo.LastUpdatedContentFinder;
>>>>>>> 040279e1b936c40f12b251889a5c278f4f9867aa
import org.atlasapi.persistence.topic.TopicContentLister;

@Configuration
Solution content 
import org.atlasapi.persistence.content.ContentGroupResolver;
import org.atlasapi.persistence.content.ContentGroupWriter;
import org.atlasapi.persistence.content.listing.ContentLister;
import org.atlasapi.persistence.content.mongo.LastUpdatedContentFinder;
import org.atlasapi.persistence.content.mongo.MongoContentGroupResolver;
import org.atlasapi.persistence.content.mongo.MongoContentGroupWriter;
import org.atlasapi.persistence.topic.TopicContentLister;

@Configuration
File
MongoContentPersistenceModule.java
Developer's decision
Concatenation
Kind of conflict
Import