| Chunk |
|---|
| Conflicting content |
|---|
private void disableConnectionReuseIfNecessary() {
// HTTP connection reuse which was buggy pre-gingerbread
<<<<<<< HEAD
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.FROYO) {
=======
if (Build.VERSION.SDK_INT < 9) {
>>>>>>> ca47034ffe6d8b41b8ec59f30d1af91db4593cb8
System.setProperty("http.keepAlive", "false");
}
} |
| Solution content |
|---|
private void disableConnectionReuseIfNecessary() {
// HTTP connection reuse which was buggy pre-gingerbread
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.FROYO) {
System.setProperty("http.keepAlive", "false");
}
} |
| File |
|---|
| BedditWebConnector.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |