From b3d0edb99a4723879887064280c5b6a5761322b1 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Tue, 6 Jun 2017 07:51:51 +0200
Subject: Update Spanish files

---
 es/uninstall-Mageia.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'es/uninstall-Mageia.html')

diff --git a/es/uninstall-Mageia.html b/es/uninstall-Mageia.html
index 4df334b..33c5cc0 100644
--- a/es/uninstall-Mageia.html
+++ b/es/uninstall-Mageia.html
@@ -31,7 +31,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e1238"></a>Guias
+=======
                      <h3 class="title"><a name="d5e1241"></a>Guias
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
-- 
cgit v1.2.1