From 0975f81d0f8ac40130e3482b3b32fb89846ad67f Mon Sep 17 00:00:00 2001
From: madwasp79 <madwasp79@gmail.com>
Date: Tue, 28 May 2019 13:31:18 +0300
Subject: [PATCH] update master and resolve strings conflict

---
 OsmAnd/res/values/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 1ad4c815dc..856d61ab03 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,6 +11,8 @@
 	Thx - Hardy
 
 -->
+
+    <string name="app_mode_skiing">Skiing</string>
     <string name="base_profile_descr_ski">Skiing</string>
     <string name="show_compass_ruler">Show compass ruler</string>
     <string name="hide_compass_ruler">Hide compass ruler</string>
@@ -3157,7 +3159,7 @@
     <string name="run_full_osmand_header">Launch OsmAnd?</string>
     <string name="routing_attr_avoid_sett_name">Avoid cobblestone and sett</string>
     <string name="routing_attr_avoid_sett_description">Avoid cobblestone and sett</string>
-  <string name="app_mode_skiing">Skiing</string>
+
 
 
 </resources>