diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-27 15:06:02 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-27 15:06:02 +0100 |
| commit | 09410e7f697395b1764e5f8e56581fe1d93be1fa (patch) | |
| tree | fa83b21a699be75f25b9bcd920b58fa101a65eb6 | |
| parent | aca0cd340bda38cc15547aa5a116c679782ff740 (diff) | |
| download | open-keychain-09410e7f697395b1764e5f8e56581fe1d93be1fa.tar.gz open-keychain-09410e7f697395b1764e5f8e56581fe1d93be1fa.tar.bz2 open-keychain-09410e7f697395b1764e5f8e56581fe1d93be1fa.zip | |
Fix merge conflicts
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 9962888cd..e18884008 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1703,8 +1703,6 @@ <string name="share_log_dialog_cancel_button">"Cancel"</string> <string name="toast_wrong_mimetype">"Wrong data type, text was expected!"</string> <string name="toast_no_text">"No text in shared data!"</string> - <string name="btn_search_for_query">"Search for\n'%s'"</string> - <string name="menu_uids_save">Save</string> <string name="menu_uids_save">"Save"</string> <string name="title_edit_identities">"Edit Identities"</string> <string name="title_edit_subkeys">"Edit Subkeys"</string> |