| Chunk |
|---|
| Conflicting content |
|---|
public void onItemSelected(AdapterView> parent,
View view, int pos, long id) {
<<<<<<< HEAD
Toast.makeText(parent.getContext(),
parent.getItemAtPosition(pos).toString(), Toast.LENGTH_LONG).show();
=======
Toast.makeText(parent.getContext(), parent.getItemAtPosition(pos).toString(), Toast.LENGTH_LONG).show();
>>>>>>> 94b22263852633a82de81b5fe7aff042df947c62
}
public void onNothingSelected(AdapterView parent) { |
| Solution content |
|---|
public void onItemSelected(AdapterView> parent,
View view, int pos, long id) {
Toast.makeText(parent.getContext(),
parent.getItemAtPosition(pos).toString(), Toast.LENGTH_LONG).show();
Toast.makeText(parent.getContext(), parent.getItemAtPosition(pos).toString(), Toast.LENGTH_LONG).show();
}
public void onNothingSelected(AdapterView parent) { |
| File |
|---|
| InfotecActivity.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Method invocation |