From 71c53f13ece742c4c3673ef1939313af84e92eb6 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 30 Dec 2014 16:24:20 +0100
Subject: fix small merge conflict oversight

---
 .../org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java   | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'OpenKeychain')

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;
-- 
cgit v1.2.3