| Chunk |
|---|
| Conflicting content |
|---|
}
@Override
<<<<<<< HEAD
public void onDestroyView() {
super.onDestroyView();
overlays.clear();
pontoOverlay.clear();
ViewGroup parentViewGroup = (ViewGroup) container.getParent();
if (null != parentViewGroup) {
parentViewGroup.removeView(container);
}
=======
public String getName() {
return onibus.getLetreiro();
>>>>>>> d6001c27fdc986d9520608d55fd9837d6ab9bda5
}
} |
| Solution content |
|---|
}
@Override
public void onDestroyView() {
super.onDestroyView();
overlays.clear();
pontoOverlay.clear();
ViewGroup parentViewGroup = (ViewGroup) container.getParent();
if (null != parentViewGroup) {
parentViewGroup.removeView(container);
}
}
} |
| File |
|---|
| MapaOnibusFragment.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Cast expression |
| If statement |
| Method invocation |
| Method signature |
| Return statement |
| Variable |