cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix small merge conflict oversight

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-12-30 16:24:20 +01:00
parent 9e663237b6
commit 71c53f13ec
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
View File

@@ -214,9 +214,6 @@ public class PassphraseDialogActivity extends FragmentActivity {
case DIVERT_TO_CARD: case DIVERT_TO_CARD:
message = getString(R.string.yubikey_pin_for, userId); message = getString(R.string.yubikey_pin_for, userId);
break; break;
case PIN:
message = getString(R.string.pin_for, userId);
break;
default: default:
message = "This should not happen!"; message = "This should not happen!";
break; break;