From 984a084705f358bc9799d634eb81427e81982051 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Sun, 25 Jun 2017 18:38:09 +0200
Subject: Update translations

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

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

diff --git a/es/uninstall-Mageia.html b/es/uninstall-Mageia.html
index 33c5cc0..49a43f9 100644
--- a/es/uninstall-Mageia.html
+++ b/es/uninstall-Mageia.html
@@ -31,11 +31,7 @@
             <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