| Chunk |
|---|
| Conflicting content |
|---|
import org.atlasapi.persistence.logging.AdapterLog; import org.atlasapi.persistence.logging.AdapterLogEntry; import org.atlasapi.persistence.logging.AdapterLogEntry.Severity; <<<<<<< HEAD import org.atlasapi.persistence.topic.TopicStore; ======= import org.atlasapi.remotesite.HttpClients; >>>>>>> 2519165694e9f6fe6119b10d4919b8611bb33fcf import org.atlasapi.remotesite.bbc.atoz.BbcSlashProgrammesAtoZUpdater; import org.atlasapi.remotesite.bbc.ion.BbcIonContentUpdateController; import org.atlasapi.remotesite.bbc.ion.BbcIonContainerFetcherClient; |
| Solution content |
|---|
import org.atlasapi.persistence.logging.AdapterLog; import org.atlasapi.persistence.logging.AdapterLogEntry; import org.atlasapi.persistence.logging.AdapterLogEntry.Severity; import org.atlasapi.persistence.topic.TopicStore; import org.atlasapi.remotesite.HttpClients; import org.atlasapi.remotesite.bbc.atoz.BbcSlashProgrammesAtoZUpdater; import org.atlasapi.remotesite.bbc.ion.BbcIonContentUpdateController; import org.atlasapi.remotesite.bbc.ion.BbcIonContainerFetcherClient; |
| File |
|---|
| BbcModule.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; <<<<<<< HEAD import com.metabroadcast.common.persistence.mongo.DatabasedMongo; ======= import com.google.gson.reflect.TypeToken; >>>>>>> 2519165694e9f6fe6119b10d4919b8611bb33fcf import com.metabroadcast.common.scheduling.RepetitionRule; import com.metabroadcast.common.scheduling.RepetitionRules; import com.metabroadcast.common.scheduling.SimpleScheduler; |
| Solution content |
|---|
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import com.metabroadcast.common.persistence.mongo.DatabasedMongo; import com.google.gson.reflect.TypeToken; import com.metabroadcast.common.scheduling.RepetitionRule; import com.metabroadcast.common.scheduling.RepetitionRules; import com.metabroadcast.common.scheduling.SimpleScheduler; |
| File |
|---|
| BbcModule.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |