| Chunk |
|---|
| Conflicting content |
|---|
public boolean isVerifiedUser(String userId, String fingerprint) {
if (userId == null)
return false;
<<<<<<< HEAD
String pubKeyVerifiedToken = buildPublicKeyVerifiedId(userId, getRemoteFingerprint(userId));
=======
String pubKeyVerifiedToken = buildPublicKeyVerifiedId(userId, fingerprint);
>>>>>>> 009ac284c820ba0611502844e217fd165e87ed7e
return this.store.getPropertyBoolean(pubKeyVerifiedToken, false);
} |
| Solution content |
|---|
public boolean isVerifiedUser(String userId, String fingerprint) {
if (userId == null)
return false;
String pubKeyVerifiedToken = buildPublicKeyVerifiedId(userId, fingerprint);
return this.store.getPropertyBoolean(pubKeyVerifiedToken, false);
} |
| File |
|---|
| OtrAndroidKeyManagerImpl.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |