Projects >> IRIS >>27e1458f8a85409dd8128223aa5dd997b33a5587

Chunk
Conflicting content 
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
<<<<<<< HEAD
=======
import static org.mockito.Matchers.anyString;
>>>>>>> 1f1c1f6a54d7ada600abadc106a8619420732663
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
Solution content 
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
File
TestResourceGETExpression.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import com.temenos.interaction.core.hypermedia.Link;
import com.temenos.interaction.core.hypermedia.ResourceState;
import com.temenos.interaction.core.hypermedia.ResourceStateMachine;
<<<<<<< HEAD
=======
import com.temenos.interaction.core.hypermedia.Transition;
import com.temenos.interaction.core.hypermedia.expression.Expression;
import com.temenos.interaction.core.hypermedia.expression.SimpleLogicalExpressionEvaluator;
>>>>>>> 1f1c1f6a54d7ada600abadc106a8619420732663
import com.temenos.interaction.core.resource.EntityResource;
import com.temenos.interaction.core.resource.RESTResource;
import com.temenos.interaction.core.resource.ResourceTypeHelper;
Solution content 
import com.temenos.interaction.core.hypermedia.Link;
import com.temenos.interaction.core.hypermedia.ResourceState;
import com.temenos.interaction.core.hypermedia.ResourceStateMachine;
import com.temenos.interaction.core.hypermedia.Transition;
import com.temenos.interaction.core.hypermedia.expression.Expression;
import com.temenos.interaction.core.hypermedia.expression.SimpleLogicalExpressionEvaluator;
import com.temenos.interaction.core.resource.EntityResource;
import com.temenos.interaction.core.resource.RESTResource;
import com.temenos.interaction.core.resource.ResourceTypeHelper;
File
TestResponseHTTPHypermediaRIM.java
Developer's decision
Version 2
Kind of conflict
Import