From 1f873e205765d2653b2a002463571ed05657ed1f Mon Sep 17 00:00:00 2001
From: XoseM <correo@xmgz.eu>
Date: Wed, 21 Feb 2018 12:14:48 +0100
Subject: [PATCH] fixed strings from gl-tranlation branch

---
 app/src/main/res/values-gl/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 8c17aa42..218d5d44 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -49,13 +49,8 @@
   <string name="action_exit_app">Saír do app</string>
   <string name="action_toggle_desktop_page">Vista móbil/escritorio</string>
   <string name="action_share_dotdotdot">Compartir&#8230;</string>
-<<<<<<< HEAD
   <string name="search_alert_tag">Etiquetas</string>
   <string name="search_alert_people">Persoas</string>
-=======
-  <string name="search_alert_tag">etiquetas</string>
-  <string name="search_alert_people">persoas</string>
->>>>>>> gl-translation
   <string name="search_alert_bypeople_validate_needsomedata">Por favor engada un nome</string>
   <string name="context_menu_share_link">Compartir ligazón</string>
   <string name="context_menu_save_image">Gardar imaxe</string>