| Chunk |
|---|
| Conflicting content |
|---|
private long mSigningKeyId = Constants.key.none;
private Passphrase mPassphrase = new Passphrase();
<<<<<<< HEAD
private ArrayList |
| Solution content |
|---|
private long mSigningKeyId = Constants.key.none;
private Passphrase mPassphrase = new Passphrase();
private ArrayList |
| File |
|---|
| EncryptFilesFragment.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |