fix small merge conflict oversight

2014-12-30 16:24:20 +01:00
parent 9e663237b6
commit 71c53f13ec
1 changed files with 0 additions and 3 deletions
--- 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;