| Chunk |
|---|
| Conflicting content |
|---|
// If there is more than one choice, pick a key
if (mAdapter.getCount() >= 2) {
// preselect if key can certify
<<<<<<< HEAD
if (data.moveToPosition(0)) {
=======
if (data.moveToPosition(0) ){
>>>>>>> 448797e6490bdec85916827f95ade24d4a69b200
do {
if (!data.isNull(mIndexHasCertify)) {
setSelection(data.getPosition() + 1); |
| Solution content |
|---|
// If there is more than one choice, pick a key
if (mAdapter.getCount() >= 2) {
// preselect if key can certify
if (data.moveToPosition(0)) {
do {
if (!data.isNull(mIndexHasCertify)) {
setSelection(data.getPosition() + 1); |
| File |
|---|
| CertifyKeySpinner.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
setSelection(data.getPosition() + 1);
break;
}
<<<<<<< HEAD
}
while (data.moveToNext());
=======
}while(data.moveToNext());
>>>>>>> 448797e6490bdec85916827f95ade24d4a69b200
}
}
} |
| Solution content |
|---|
setSelection(data.getPosition() + 1);
break;
}
}
while (data.moveToNext());
}
}
} |
| File |
|---|
| CertifyKeySpinner.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |