| Chunk |
|---|
| Conflicting content |
|---|
return new ZKRemoteWebDriver(new URL(remotePath),
DesiredCapabilities.opera());
} else if ("androiddriver".equalsIgnoreCase(key)) {
<<<<<<< HEAD
return new AndroidDriver(new URL(remotePath),
DesiredCapabilities.android());
=======
return new AndroidDriver(remotePath);
>>>>>>> 8a44d2f5dcb6469589a3fb657877583157d2d299
} else if ("iphonedriver".equalsIgnoreCase(key)) {
return new ZKRemoteWebDriver(new URL(remotePath),
DesiredCapabilities.iphone()); |
| Solution content |
|---|
return new ZKRemoteWebDriver(new URL(remotePath),
DesiredCapabilities.opera());
} else if ("androiddriver".equalsIgnoreCase(key)) {
return new AndroidDriver(remotePath);
} else if ("iphonedriver".equalsIgnoreCase(key)) {
return new ZKRemoteWebDriver(new URL(remotePath),
DesiredCapabilities.iphone()); |
| File |
|---|
| ConfigHelper.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Return statement |