From b9338dfac4c172cbf67ccd9690e8cf9dcd1376fc Mon Sep 17 00:00:00 2001
From: greshilov <slovaricheg@gmail.com>
Date: Mon, 30 Jul 2018 19:11:33 +0300
Subject: [PATCH] [strings] Fix wrong conflict resolve

---
 android/res/values-ru/strings.xml | 19 -------------------
 android/res/values/strings.xml    | 19 -------------------
 2 files changed, 38 deletions(-)

diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 490af4b131..d52892a5d4 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -1215,25 +1215,6 @@
 	<string name="expertise">Профессионализм</string>
 	<string name="equipment">Оборудование</string>
 	<string name="quality">Качество</string>
-	<string name="sponsored_partner1_action">Кешбэк</string>
-	<string name="sponsored_partner3_action">Купон</string>
-	<string name="sponsored_partner4_action">Магазин</string>
-	<string name="sponsored_partner5_action">Билеты</string>
-	<string name="sponsored_partner6_action">Магазин</string>
-	<string name="sponsored_partner7_action">Магазин</string>
-	<string name="sponsored_partner8_action">Акция</string>
-	<string name="sponsored_partner9_action">Акция</string>
-	<string name="sponsored_partner10_action">Магазин</string>
-	<string name="sponsored_partner11_action">-</string>
-	<string name="sponsored_partner12_action">Магазин</string>
-	<string name="sponsored_partner13_action">-</string>
-	<string name="sponsored_partner14_action">-</string>
-	<string name="sponsored_partner15_action">-</string>
-	<string name="sponsored_partner16_action">-</string>
-	<string name="sponsored_partner17_action">-</string>
-	<string name="sponsored_partner18_action">Лайфхак</string>
-	<string name="sponsored_partner19_action">Лайфхак</string>
-	<string name="sponsored_partner20_action">Лайфхак</string>
 	<string name="whats_new_ugc_title">Оценки и отзывы</string>
 	<string name="whats_new_ugc_message">Теперь вы можете оставлять оценки и отзывы даже офлайн! Не забудьте обновить карты, чтобы увидеть изменения.</string>
 	<string name="dialog_error_storage_title">Проблема с доступом к хранилищу</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 6d873029ee..6fbbdf0221 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1227,25 +1227,6 @@
 	<string name="expertise">Expertise</string>
 	<string name="equipment">Equipment</string>
 	<string name="quality">Quality</string>
-	<string name="sponsored_partner1_action">Cash back</string>
-	<string name="sponsored_partner3_action">Coupon</string>
-	<string name="sponsored_partner4_action">Store</string>
-	<string name="sponsored_partner5_action">Tickets</string>
-	<string name="sponsored_partner6_action">Store</string>
-	<string name="sponsored_partner7_action">Store</string>
-	<string name="sponsored_partner8_action">Special</string>
-	<string name="sponsored_partner9_action">Special</string>
-	<string name="sponsored_partner10_action">Store</string>
-	<string name="sponsored_partner11_action">-</string>
-	<string name="sponsored_partner12_action">Store</string>
-	<string name="sponsored_partner13_action">-</string>
-	<string name="sponsored_partner14_action">-</string>
-	<string name="sponsored_partner15_action">-</string>
-	<string name="sponsored_partner16_action">-</string>
-	<string name="sponsored_partner17_action">-</string>
-	<string name="sponsored_partner18_action">Lifehack</string>
-	<string name="sponsored_partner19_action">Lifehack</string>
-	<string name="sponsored_partner20_action">Lifehack</string>
 	<string name="whats_new_ugc_title">Ratings and reviews</string>
 	<string name="whats_new_ugc_message">You can now leave ratings and reviews even offline! Don\'t forget to update your maps so you can see the changes.</string>
 	<string name="dialog_error_storage_title">Storage access problem</string>