| Chunk |
|---|
| Conflicting content |
|---|
runner.setPort(port);
runner.setSaveAfterRun(saveAfterRun);
<<<<<<< HEAD
if (runnerWrapper.isProRunner()) {
SoapUIProExtensionMockServiceRunner proRunner = (SoapUIProExtensionMockServiceRunner) runner;
proRunner.activateCoverageReport(coverageReport);
proRunner.setOutputFolder(outputFolder);
}
=======
>>>>>>> e46f1489632153b016ad3d3b5d1166ba31362790
try {
runner.run();
} catch (Exception e) { |
| Solution content |
|---|
runner.setPort(port);
runner.setSaveAfterRun(saveAfterRun);
if (runnerWrapper.isProRunner()) {
SoapUIProExtensionMockServiceRunner proRunner = (SoapUIProExtensionMockServiceRunner) runner;
proRunner.activateCoverageReport(coverageReport);
proRunner.setOutputFolder(outputFolder);
}
try {
runner.run();
} catch (Exception e) { |
| File |
|---|
| MockServiceMojo.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |