Projects >> atlas >>7a4ee639b5273e3cce19767ac1e2ffe096fe81ac

Chunk
Conflicting content 
>>>>>>> 9a9ba6ff09590419c38e66275fb9d5d4aecf4744
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;

<<<<<<< HEAD
import org.atlasapi.feeds.UpdateProgress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
import org.atlasapi.feeds.utils.UpdateProgress;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
Solution content 
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.atlasapi.feeds.utils.UpdateProgress;

import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
File
MagpieUpdaterTask.java
Developer's decision
Combination
Kind of conflict
Import