From 09410e7f697395b1764e5f8e56581fe1d93be1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 27 Dec 2015 15:06:02 +0100
Subject: Fix merge conflicts

---
 OpenKeychain/src/main/res/values/strings.xml | 2 --
 1 file changed, 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>
-- 
cgit v1.2.3