fix compilation error
This commit is contained in:
parent
0568de3d94
commit
3cc88518bd
@ -3,10 +3,7 @@ package com.baeldung.concurrent.daemon;
|
|||||||
import static org.junit.Assert.assertFalse;
|
import static org.junit.Assert.assertFalse;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
import org.junit.Ignore;
|
import org.junit.Ignore;
|
||||||
>>>>>>> d54917c7e9f0f74c40982571af8ac9f61782b7cb
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class DaemonThreadTest {
|
public class DaemonThreadTest {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user