| Chunk |
|---|
| Conflicting content |
|---|
.BytesToPGPSecretKey(data
.getByteArray(KeychainIntentService.RESULT_NEW_KEY));
<<<<<<< HEAD
addGeneratedKeyToView(newKeyRing);
=======
// add view with new key
KeyEditor view = (KeyEditor) mInflater.inflate(R.layout.edit_key_key_item,
mEditors, false);
view.setEditorListener(SectionView.this);
view.setValue(newKey, newKey.isMasterKey(), -1);
mEditors.addView(view);
SectionView.this.updateEditorsVisible();
>>>>>>> 3f0f3cca6afa65dba4ff5868e5112cce39e2dc94
}
};
}; |
| Solution content |
|---|
.BytesToPGPSecretKey(data
.getByteArray(KeychainIntentService.RESULT_NEW_KEY));
addGeneratedKeyToView(newKey);
}
};
}; |
| File |
|---|
| SectionView.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Cast expression |
| Comment |
| Method invocation |
| Variable |