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

---
 eu/index.html | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'eu/index.html')

diff --git a/eu/index.html b/eu/index.html
index 2640a79..69bb5c7 100644
--- a/eu/index.html
+++ b/eu/index.html
@@ -75,8 +75,7 @@
                <dt><span class="section"><a href="setupBootloader.html">Abio kargatzailearen aukera nagusiak</a></span></dt>
                <dd>
                   <dl>
-<<<<<<< HEAD
-                     <dt><span class="section"><a href="setupBootloader.html#d5e901">Bootloader interface</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e901">Abioko kargatzailearen interfazea</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e929">Mageia abio kargatzailea erabiliz</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e945">Existitzen den abio kargatzaile bat erabiliz</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e948">Using chain loading</a></span></dt>
@@ -84,19 +83,6 @@
                   </dl>
                </dd>
                <dt><span class="section"><a href="setupBootloaderAddEntry.html">Gegitu edo Aldatu Abio Menuko Sarrera</a></span></dt>
-=======
-                     <dt><span class="section"><a href="setupBootloader.html#d5e909">Bios sistemarekin</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e946">UEFI sistemarekin</a></span></dt>
-                  </dl>
-               </dd>
-               <dt><span class="section"><a href="setupBootloaderAddEntry.html">Gegitu edo Aldatu Abio Menuko Sarrera</a></span></dt>
-               <dd>
-                  <dl>
-                     <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e965">Bios sistemarekin</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e982">UEFI sistemarekin</a></span></dt>
-                  </dl>
-               </dd>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                <dt><span class="section"><a href="misc-params.html">Hainbat parametroen laburpena</a></span></dt>
                <dd>
                   <dl>
@@ -127,11 +113,7 @@
                <dt><span class="section"><a href="uninstall-Mageia.html">Mageia desinstalatzen</a></span></dt>
                <dd>
                   <dl>
-<<<<<<< HEAD
                      <dt><span class="section"><a href="uninstall-Mageia.html#d5e1271">Jarraibideak</a></span></dt>
-=======
-                     <dt><span class="section"><a href="uninstall-Mageia.html#d5e1221">Jarraibideak</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                   </dl>
                </dd>
             </dl>
-- 
cgit v1.2.1