iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed failing tests

This commit is contained in:
egimaben 2016-07-31 17:38:31 +03:00
parent afb340d928
commit f9459a583c
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dozer-tutorial/src/test/java/com/baeldung/dozer/DozerTest.java
View File

@ -16,14 +16,8 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
public class DozerTest { public class DozerTest {
<<<<<<< HEAD
DozerBeanMapper mapper = new DozerBeanMapper(); DozerBeanMapper mapper = new DozerBeanMapper();
private final long GMT_DIFFERENCE=46800000; private final long GMT_DIFFERENCE=46800000;
=======
private DozerBeanMapper mapper = new DozerBeanMapper();
>>>>>>> 6f2ccdf18729969951fc37e635d24c30dd9b43d5
@Before @Before
public void before() throws Exception { public void before() throws Exception {
mapper = new DozerBeanMapper(); mapper = new DozerBeanMapper();