Projects >> atlas >>bc2945eeeead2965a5e5d2ed8eb2413591cd8425

Chunk
Conflicting content 
import org.atlasapi.media.entity.MediaType;
import org.atlasapi.media.entity.Specialization;
import org.atlasapi.media.entity.simple.Description;
<<<<<<< HEAD
import org.atlasapi.media.entity.simple.Image;
=======
>>>>>>> 8109633b830715c11f9f4c58440070291adc8ed6
import org.atlasapi.output.Annotation;

import com.google.common.collect.ImmutableSet;
Solution content 
import org.atlasapi.media.entity.MediaType;
import org.atlasapi.media.entity.Specialization;
import org.atlasapi.media.entity.simple.Description;
import org.atlasapi.media.entity.simple.Image;
import org.atlasapi.output.Annotation;

import com.google.common.collect.ImmutableSet;
File
DescribedModelSimplifier.java
Developer's decision
Version 1
Kind of conflict
Import