Projects >> atlas-persistence >>81d20c9f16c9686a21a6181fe96df464e4d1e9e4

Chunk
Conflicting content 
	ScheduleWriter scheduleWriter();
	
	LastUpdatedContentFinder lastUpdatedContentFinder();
<<<<<<< HEAD
		
=======
	
	TopicContentLister topicContentLister();
    
    ContentLister contentLister();
	
>>>>>>> af0efd7ab290fc29b6cbf9fc6f0a85e40d719c82
    RecentChangeStore recentChangesStore();
    
    ContentLister contentLister();
Solution content 
	ScheduleWriter scheduleWriter();
	
	LastUpdatedContentFinder lastUpdatedContentFinder();
		
    RecentChangeStore recentChangesStore();
    
    ContentLister contentLister();
File
ContentPersistenceModule.java
Developer's decision
Version 1
Kind of conflict
Method interface
Chunk
Conflicting content 
import org.atlasapi.persistence.content.listing.ContentLister;
import org.atlasapi.persistence.event.RecentChangeStore;
import org.atlasapi.persistence.event.mongo.MongoRecentChangesStore;
<<<<<<< HEAD
import org.atlasapi.persistence.topic.TopicContentUriLister;
import org.springframework.context.annotation.Bean;
=======
>>>>>>> af0efd7ab290fc29b6cbf9fc6f0a85e40d719c82
public class MongoContentPersistenceModule implements ContentPersistenceModule {
Solution content 
import org.atlasapi.persistence.event.RecentChangeStore;
import org.atlasapi.persistence.event.mongo.MongoRecentChangesStore;
import org.atlasapi.persistence.topic.TopicContentUriLister;

public class MongoContentPersistenceModule implements ContentPersistenceModule {
File
MongoContentPersistenceModule.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        return scheduleStore;
    }

<<<<<<< HEAD
	public ShortUrlSaver shortUrlSaver() {
		return shortUrlSaver;
	}

    public TopicContentUriLister topicContentUriLister() {
		return contentLister;
    }
	
	public ContentLister contentLister() {
		return contentLister;
=======
    public ItemsPeopleWriter itemsPeopleWriter() {
        return itemsPeopleWriter;
    }

    public MongoPersonStore personStore() {
        return personStore;
    }

    public ShortUrlSaver shortUrlSaver() {
        return shortUrlSaver;
    }

    public MongoContentLister contentLister() {
        return contentLister;
>>>>>>> af0efd7ab290fc29b6cbf9fc6f0a85e40d719c82
    }

    public LastUpdatedContentFinder lastUpdatedContentFinder() {
Solution content 
        return scheduleStore;
    }

    public ItemsPeopleWriter itemsPeopleWriter() {
        return itemsPeopleWriter;
    }

    public MongoPersonStore personStore() {
        return personStore;
    }

    public ShortUrlSaver shortUrlSaver() {
        return shortUrlSaver;
    }

    public MongoContentLister contentLister() {
        return contentLister;
    }

    public LastUpdatedContentFinder lastUpdatedContentFinder() {
File
MongoContentPersistenceModule.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method declaration
Method signature
Return statement