fix compilation error

2017-11-15 23:40:35 +02:00 · 2017-11-15 23:40:35 +02:00 · 3cc88518bd
commit 3cc88518bd
parent 0568de3d94
1 changed files with 0 additions and 3 deletions
--- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java
+++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java
@ -3,10 +3,7 @@ package com.baeldung.concurrent.daemon;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

-<<<<<<< HEAD
-=======
 import org.junit.Ignore;
->>>>>>> d54917c7e9f0f74c40982571af8ac9f61782b7cb
 import org.junit.Test;

 public class DaemonThreadTest {