diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 16:24:20 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 16:24:20 +0100 |
| commit | 71c53f13ece742c4c3673ef1939313af84e92eb6 (patch) | |
| tree | 61b86fc54ed02932cbf6bbbe76ff3b7a74fd5521 /OpenKeychain | |
| parent | 9e663237b6dc4880bcdb1c763374c44f9f4416d2 (diff) | |
| download | open-keychain-71c53f13ece742c4c3673ef1939313af84e92eb6.tar.gz open-keychain-71c53f13ece742c4c3673ef1939313af84e92eb6.tar.bz2 open-keychain-71c53f13ece742c4c3673ef1939313af84e92eb6.zip | |
fix small merge conflict oversight
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java index cd564551a..fd9324992 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java @@ -214,9 +214,6 @@ public class PassphraseDialogActivity extends FragmentActivity { case DIVERT_TO_CARD: message = getString(R.string.yubikey_pin_for, userId); break; - case PIN: - message = getString(R.string.pin_for, userId); - break; default: message = "This should not happen!"; break; |