fixed failing tests

2016-07-31 17:38:31 +03:00 · 2016-07-31 17:38:31 +03:00 · f9459a583c
parent afb340d928
commit f9459a583c
1 changed files with 0 additions and 6 deletions
--- a/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java
+++ b/dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java
@ -16,14 +16,8 @@ import org.junit.Before;
 import org.junit.Test;

 public class DozerTest {
-<<<<<<< HEAD
 	DozerBeanMapper mapper = new DozerBeanMapper();
 	private final long GMT_DIFFERENCE=46800000;
-=======
-
-	private DozerBeanMapper mapper = new DozerBeanMapper();
->>>>>>> 6f2ccdf18729969951fc37e635d24c30dd9b43d5
-
 	@Before
 	public void before() throws Exception {
 		mapper = new DozerBeanMapper();