From 30d1363f3cad97492df9e9f02d9e191186ce7d11 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Tue, 6 Jun 2017 07:52:40 +0200
Subject: Update Basque files

---
 eu/index.html | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'eu/index.html')

diff --git a/eu/index.html b/eu/index.html
index a9962b6..2640a79 100644
--- a/eu/index.html
+++ b/eu/index.html
@@ -28,8 +28,8 @@
                   <dl>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Sarrera</a></span></dt>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Baliabidea</a></span></dt>
-                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e142">Media Deskargatu eta Egiaztatzen</a></span></dt>
-                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e169">Grabatu edo irauli ISOa</a></span></dt>
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Media Deskargatu eta Egiaztatzen</a></span></dt>
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Grabatu edo irauli ISOa</a></span></dt>
                   </dl>
                </dd>
                <dt><span class="section"><a href="installer.html">DrakX, Mageia Instalatzilea</a></span></dt>
@@ -75,6 +75,16 @@
                <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#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>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e964">Aukerak</a></span></dt>
+                  </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>
@@ -86,6 +96,7 @@
                      <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>
@@ -116,7 +127,11 @@
                <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