Projects >> zanata-server >>00796220041ca00057ea6734010355f54895a7b4

Chunk
Conflicting content 
import java.util.HashMap;
import java.util.Map;

<<<<<<< HEAD:flies-war/src/test/java/org/fedorahosted/flies/core/rest/ProjectResourceTest.java
=======
import javax.persistence.EntityManager;

import org.dbunit.operation.DatabaseOperation;
import org.fedorahosted.flies.core.model.Account;
import org.jboss.seam.mock.DBUnitSeamTest;
import org.jboss.seam.mock.ResourceRequestEnvironment;
>>>>>>> e28b5602e86b09f8ca7e696e2df411a17fe5c45c:flies-web-test/src/test/org/fedorahosted/flies/core/rest/ProjectResourceTest.java
import org.jboss.seam.mock.EnhancedMockHttpServletRequest;
import org.jboss.seam.mock.EnhancedMockHttpServletResponse;
import org.jboss.seam.mock.ResourceRequestEnvironment;
Solution content 
import java.util.HashMap;
import java.util.Map;

import org.jboss.seam.mock.EnhancedMockHttpServletRequest;
import org.jboss.seam.mock.EnhancedMockHttpServletResponse;
import org.jboss.seam.mock.ResourceRequestEnvironment;
File
ProjectResourceTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

<<<<<<< HEAD:flies-war/src/test/java/org/fedorahosted/flies/core/rest/ProjectResourceTest.java
public class ProjectResourceTest extends SeamTest {
=======
import static org.jboss.seam.mock.ResourceRequestEnvironment.ResourceRequest;
import static org.jboss.seam.mock.ResourceRequestEnvironment.Method;

public class ProjectResourceTest extends DBUnitSeamTest {
>>>>>>> e28b5602e86b09f8ca7e696e2df411a17fe5c45c:flies-web-test/src/test/org/fedorahosted/flies/core/rest/ProjectResourceTest.java

	ResourceRequestEnvironment sharedEnvironment;
Solution content 
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

public class ProjectResourceTest extends SeamTest {

	ResourceRequestEnvironment sharedEnvironment;
File
ProjectResourceTest.java
Developer's decision
Version 1
Kind of conflict
Import