| Chunk |
|---|
| Conflicting content |
|---|
try {
int statusCode = httpClient.executeMethod(getMethod);
<<<<<<< HEAD
=======
if (statusCode != HttpStatus.SC_OK) {
Log.error("Method failed: "
+ getMethod.getStatusLine());
}
>>>>>>> 9c525baaee97af76ce108b75ed79953e6dfe4815
byte[] responseBody = getMethod.getResponseBody();
|
| Solution content |
|---|
try {
int statusCode = httpClient.executeMethod(getMethod);
byte[] responseBody = getMethod.getResponseBody();
|
| File |
|---|
| DMZSyncServiceImpl.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |