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/setupBootloaderAddEntry.html | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'es/setupBootloaderAddEntry.html')

diff --git a/es/setupBootloaderAddEntry.html b/es/setupBootloaderAddEntry.html
index 2431cb2..c5b847d 100644
--- a/es/setupBootloaderAddEntry.html
+++ b/es/setupBootloaderAddEntry.html
@@ -27,13 +27,8 @@
            
          
            
-<<<<<<< HEAD
          <p>Para ello, necesita editar manualmente /boot/grub2/custom.cfg o usar el
             software grub-customizer (Disponible en los repositorios Mageia).
-=======
-         <p>To do that you need to manually edit /boot/grub2/custom.cfg or use the
-            software grub-customizer instead (Available in the Mageia repositories).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          </p>
          
            
@@ -46,11 +41,7 @@
                <tr>
                   <td align="left" valign="top">
                          
-<<<<<<< HEAD
                      <p>Para m&aacute;s informaci&oacute;n, vea nuestro wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p>
-=======
-                     <p>For more information, see our wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                        
                   </td>
                </tr>
-- 
cgit v1.2.1