[BAEL-9017] - Fixed conflicts

This commit is contained in:
amit2103
2018-09-29 21:12:21 +05:30
parent 258532c40f
commit 2af9eb89f1
12 changed files with 28 additions and 28 deletions
@@ -18,9 +18,9 @@ import org.junit.Test;
import com.stackify.models.User;
import com.stackify.services.MyService;
public class MyServiceTest {
public class MyServiceUnitTest {
private static final Logger logger = LogManager.getLogger(MyServiceTest.class);
private static final Logger logger = LogManager.getLogger(MyServiceUnitTest.class);
@Test
public void testService() {