From bc99bc2dca89bb9c9672d53ab594fa421e42d7d6 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 5 Mar 2016 18:50:56 +0100
Subject: [PATCH] fix file (nw)

---
 language/Spanish/strings.po | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/language/Spanish/strings.po b/language/Spanish/strings.po
index fc4562f2429..5ab8cd31ac6 100644
--- a/language/Spanish/strings.po
+++ b/language/Spanish/strings.po
@@ -1870,13 +1870,10 @@ msgid ""
 "Press ''%1$s'' to quit,\n"
 "Press ''%2$s'' to return to emulation."
 msgstr ""
-<<<<<<< HEAD
 "¿Seguro que quieres salir?\n"
 "\n"
 "Presiona «%1$s» para salir,\n"
 "Presiona «%2$s» para volver al emulador."
-=======
->>>>>>> 057a6f64c9b40c53941a3e603efad046b724a3c1
 
 #: src/emu/ui/ui.cpp:1967
 msgid "Master Volume"