Projects >> zanata-server >>db35acc7ba385a9c9d4b6abd22fe674861adce09

Chunk
Conflicting content 
import org.testng.annotations.Test;
import org.zanata.SlowTest;
import org.zanata.ZanataDbunitJpaTest;
<<<<<<< HEAD
import org.zanata.cache.InfinispanTestCacheContainer;
=======
import org.zanata.async.handle.CopyTransTaskHandle;
>>>>>>> 73e7e2c6768e11c84ccb2053da4376c4b411655c
import org.zanata.common.ContentState;
import org.zanata.common.ContentType;
import org.zanata.common.EntityStatus;
Solution content 
import org.testng.annotations.Test;
import org.zanata.SlowTest;
import org.zanata.ZanataDbunitJpaTest;
import org.zanata.async.handle.CopyTransTaskHandle;
import org.zanata.cache.InfinispanTestCacheContainer;
import org.zanata.common.ContentState;
import org.zanata.common.ContentType;
import org.zanata.common.EntityStatus;
File
CopyTransServiceImplTest.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.zanata.ZanataDbunitJpaTest;
<<<<<<< HEAD
import org.zanata.cache.InfinispanTestCacheContainer;
=======
import org.zanata.async.handle.CopyVersionTaskHandle;
>>>>>>> 73e7e2c6768e11c84ccb2053da4376c4b411655c
import org.zanata.common.EntityStatus;
import org.zanata.dao.DocumentDAO;
import org.zanata.dao.LocaleDAO;
Solution content 
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.zanata.ZanataDbunitJpaTest;
import org.zanata.async.handle.CopyVersionTaskHandle;
import org.zanata.cache.InfinispanTestCacheContainer;
import org.zanata.common.EntityStatus;
import org.zanata.dao.DocumentDAO;
import org.zanata.dao.LocaleDAO;
File
CopyVersionServiceImplTest.java
Developer's decision
Concatenation
Kind of conflict
Import