| Chunk |
|---|
| Conflicting content |
|---|
import junit.framework.TestSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
<<<<<<< HEAD
import topc.test.dynamic.*;
@RunWith(Suite.class)
@Suite.SuiteClasses({ RandomGraphTest.class })
=======
import topc.test.easy.*;
@RunWith(Suite.class)
@Suite.SuiteClasses({ UniformBoardTest.class })
>>>>>>> 825e564017f32139c7d91d11d25086d787ad1bc1
public class Runner {
} |
| Solution content |
|---|
import junit.framework.TestSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import topc.test.dynamic.*;
@RunWith(Suite.class)
@Suite.SuiteClasses({ RandomGraphTest.class })
public class Runner {
} |
| File |
|---|
| Runner.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Import |