| Chunk |
|---|
| Conflicting content |
|---|
import java.net.UnknownHostException; import java.util.List; <<<<<<< HEAD import org.atlasapi.persistence.ids.MongoSequentialIdGenerator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.metabroadcast.common.ids.IdGenerator; import com.metabroadcast.common.ids.IdGeneratorBuilder; import com.metabroadcast.common.persistence.mongo.DatabasedMongo; import com.metabroadcast.common.persistence.mongo.health.MongoIOProbe; import com.metabroadcast.common.properties.Configurer; import com.metabroadcast.common.properties.Parameter; import com.mongodb.Mongo; import com.mongodb.MongoReplicaSetProbe; import com.mongodb.ServerAddress; import com.mongodb.WriteConcern; ======= >>>>>>> 1ee8980b1ecbcccec0ea14d24a66228469fd2570 import javax.annotation.Resource; import org.atlasapi.media.content.util.EventQueueingContentWriter; |
| Solution content |
|---|
import java.net.UnknownHostException; import java.util.List; import javax.annotation.Resource; import org.atlasapi.media.content.util.EventQueueingContentWriter; |
| File |
|---|
| AtlasPersistenceModule.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.atlasapi.persistence.content.mongo.MongoProductStore; import org.atlasapi.persistence.content.people.QueuingItemsPeopleWriter; import org.atlasapi.persistence.content.schedule.mongo.MongoScheduleStore; <<<<<<< HEAD import org.atlasapi.persistence.media.segment.IdSettingSegmentWriter; import org.springframework.context.annotation.Primary; ======= >>>>>>> 1ee8980b1ecbcccec0ea14d24a66228469fd2570 import org.atlasapi.persistence.event.RecentChangeStore; import org.atlasapi.persistence.ids.MongoSequentialIdGenerator; import org.atlasapi.persistence.lookup.mongo.MongoLookupEntryStore; |
| Solution content |
|---|
import org.atlasapi.persistence.content.mongo.MongoProductStore; import org.atlasapi.persistence.content.people.QueuingItemsPeopleWriter; import org.atlasapi.persistence.content.schedule.mongo.MongoScheduleStore; import org.atlasapi.persistence.event.RecentChangeStore; import org.atlasapi.persistence.ids.MongoSequentialIdGenerator; import org.atlasapi.persistence.lookup.mongo.MongoLookupEntryStore; |
| File |
|---|
| AtlasPersistenceModule.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.atlasapi.persistence.media.segment.IdSettingSegmentWriter;
import org.atlasapi.persistence.media.segment.MongoSegmentResolver;
import org.atlasapi.persistence.shorturls.MongoShortUrlSaver;
<<<<<<< HEAD
import org.atlasapi.persistence.topic.TopicCreatingTopicResolver;
import org.atlasapi.persistence.topic.TopicQueryResolver;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.jms.core.JmsTemplate;
=======
import org.atlasapi.persistence.topic.TopicStore;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.jms.core.JmsTemplate;
import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.metabroadcast.common.ids.IdGenerator;
import com.metabroadcast.common.ids.IdGeneratorBuilder;
import com.metabroadcast.common.persistence.mongo.DatabasedMongo;
import com.metabroadcast.common.persistence.mongo.health.MongoIOProbe;
import com.metabroadcast.common.properties.Configurer;
import com.metabroadcast.common.properties.Parameter;
import com.metabroadcast.common.webapp.properties.ContextConfigurer;
import com.mongodb.Mongo;
import com.mongodb.MongoReplicaSetProbe;
import com.mongodb.ServerAddress;
import com.mongodb.WriteConcern;
>>>>>>> 1ee8980b1ecbcccec0ea14d24a66228469fd2570
@Configuration
public class AtlasPersistenceModule { |
| Solution content |
|---|
import org.atlasapi.persistence.media.segment.IdSettingSegmentWriter;
import org.atlasapi.persistence.media.segment.MongoSegmentResolver;
import org.atlasapi.persistence.shorturls.MongoShortUrlSaver;
import org.atlasapi.persistence.topic.TopicCreatingTopicResolver;
import org.atlasapi.persistence.topic.TopicQueryResolver;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.jms.core.JmsTemplate;
import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.metabroadcast.common.ids.IdGenerator;
import com.metabroadcast.common.ids.IdGeneratorBuilder;
import com.metabroadcast.common.persistence.mongo.DatabasedMongo;
import com.metabroadcast.common.persistence.mongo.health.MongoIOProbe;
import com.metabroadcast.common.properties.Configurer;
import com.metabroadcast.common.properties.Parameter;
import com.mongodb.Mongo;
import com.mongodb.MongoReplicaSetProbe;
import com.mongodb.ServerAddress;
import com.mongodb.WriteConcern;
@Configuration
public class AtlasPersistenceModule { |
| File |
|---|
| AtlasPersistenceModule.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |