From 2960dc93c0e37b62f32dfbd02968fb64c8e594f3 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 15 Feb 2021 16:27:51 +0100
Subject: [PATCH] Fix merge

---
 OsmAnd/res/values/phrases.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml
index c3b693f87f..53138bcc18 100644
--- a/OsmAnd/res/values/phrases.xml
+++ b/OsmAnd/res/values/phrases.xml
@@ -4332,7 +4332,6 @@
 	<string name="poi_wildlife_crossing_bat_bridge">Bat bridge</string>
 	<string name="poi_wildlife_crossing_bat_tunnel">Bat tunnel</string>
 
-<<<<<<< HEAD
 	<string name="poi_piste_ski_jump">Ski jump</string>
 	<string name="poi_piste_name">Piste name</string>
 	<string name="poi_gladed_yes">Gladed: yes</string>
@@ -4340,17 +4339,10 @@
 	<string name="poi_patrolled_no">Patrolled: no</string>
 	<string name="poi_piste_status_open">Piste status: open</string>
 	<string name="poi_piste_status_closed">Piste status: closed</string>
-
 	<string name="poi_summit_register_yes">Summit register: yes</string>
 	<string name="poi_summit_register_no">Summit register: no</string>
-
 	<string name="poi_mobile_library">Mobile library stop position</string>
-=======
 	<string name="poi_conference_centre">Conference centre</string>
-
 	<string name="poi_geodesist">Geodesist</string>
 
-
->>>>>>> Add phrases
-
 </resources>