Projects >> IRIS >>6e21661177b6fcd262838d41047f8409071c0973

Chunk
Conflicting content 
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

<<<<<<< HEAD
import com.temenos.interaction.core.ExtendedMediaTypes;
import com.temenos.interaction.core.MultivaluedMapImpl;
=======
import com.temenos.interaction.commands.odata.OEntityTransformer;
>>>>>>> cf501a27a5a7db1eda5a092008a09b5f8e49789a
import com.temenos.interaction.core.entity.Entity;
import com.temenos.interaction.core.entity.EntityMetadata;
import com.temenos.interaction.core.entity.EntityProperties;
Solution content 
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

import com.temenos.interaction.commands.odata.OEntityTransformer;
import com.temenos.interaction.core.ExtendedMediaTypes;
import com.temenos.interaction.core.MultivaluedMapImpl;
import com.temenos.interaction.core.entity.Entity;
import com.temenos.interaction.core.entity.EntityMetadata;
import com.temenos.interaction.core.entity.EntityProperties;
File
TestAtomXMLProvider.java
Developer's decision
Concatenation
Kind of conflict
Import