Projects >> atlas-persistence >>b98e19d4f0c138d31223efc05afc93268761a226

Chunk
Conflicting content 
import java.util.regex.Pattern;

import org.atlasapi.persistence.ids.MongoSequentialIdGenerator;
<<<<<<< HEAD
import org.atlasapi.persistence.media.entity.IdentifiedTranslator;
=======
import org.joda.time.Duration;
>>>>>>> eca38dcd919f1c24ae68a7da5fbf0cf45959b139

import com.google.common.base.Function;
import com.google.common.base.Predicate;
Solution content 
import java.util.regex.Pattern;

import org.atlasapi.persistence.ids.MongoSequentialIdGenerator;
import org.atlasapi.persistence.media.entity.IdentifiedTranslator;
import org.joda.time.Duration;

import com.google.common.base.Function;
import com.google.common.base.Predicate;
File
MongoChannelStore.java
Developer's decision
Concatenation
Kind of conflict
Import