| Chunk |
|---|
| Conflicting content |
|---|
}
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
<<<<<<< HEAD
=======
for (String filter: blacklist)
if (url.equalsIgnoreCase(filter)){
listener.onTokenRecieved("Not Supported");
return true;
}
>>>>>>> f79b07983ca517f989915daa08ee9209c6f7ae31
listener.onTokenRecieved(url);
return false;
} |
| Solution content |
|---|
}
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
for (String filter: blacklist) {
if (url.equalsIgnoreCase(filter)) {
listener.onTokenRecieved("Not Supported");
return true;
}
}
listener.onTokenRecieved(url);
return false;
} |
| File |
|---|
| AmazingWebClient.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| For statement |