| Chunk |
|---|
| Conflicting content |
|---|
testSystemListener.addTestSystemListener(listener);
}
<<<<<<< HEAD
private void initializeTest(TestPage testPage) {
testContext = createTestContext(testPage);
=======
private void initializeTest(TestPage pageToTest) {
testContext = new SlimTestContextImpl(pageToTest);
>>>>>>> fa331f0645cafe1487b31dd386325c8c1f4073a8
stopTestCalled = false;
}
|
| Solution content |
|---|
testSystemListener.addTestSystemListener(listener);
}
private void initializeTest(TestPage testPage) {
testContext = createTestContext(testPage);
stopTestCalled = false;
}
|
| File |
|---|
| SlimTestSystem.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Method signature |