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

---
 de/index.html | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'de/index.html')

diff --git a/de/index.html b/de/index.html
index acb6617..bfa490e 100644
--- a/de/index.html
+++ b/de/index.html
@@ -28,8 +28,13 @@
                   <dl>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Einleitung</a></span></dt>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Medien</a></span></dt>
+<<<<<<< HEAD
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Medien herunterladen und &uuml;berpr&uuml;fen</a></span></dt>
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Brennen oder &uuml;bertragen der ISO</a></span></dt>
+=======
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Medien herunterladen und &uuml;berpr&uuml;fen</a></span></dt>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Brennen oder &uuml;bertragen der ISO</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                   </dl>
                </dd>
                <dt><span class="section"><a href="installer.html">DrakX, das Mageia Installationsprogramm</a></span></dt>
@@ -75,11 +80,19 @@
                <dt><span class="section"><a href="setupBootloader.html">Hauptoptionen des Bootloaders</a></span></dt>
                <dd>
                   <dl>
+<<<<<<< HEAD
+                     <dt><span class="section"><a href="setupBootloader.html#d5e902">Bootloader Oberfl&auml;che</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e926">Verwenden des Mageia Bootloaders</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e940">Verwenden eines bestehenden Bootloaders</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e943">Verwenden des Chain-Loader</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e957">Optionen</a></span></dt>
+=======
                      <dt><span class="section"><a href="setupBootloader.html#d5e919">Bootloader interface</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e949">Verwenden des Mageia Bootloaders</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e966">Verwenden eines bestehenden Bootloaders</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e969">Verwenden des Chain-Loader</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e986">Optionen</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                   </dl>
                </dd>
                <dt><span class="section"><a href="setupBootloaderAddEntry.html">Hinzuf&uuml;gen oder &auml;ndern eines Boot Men&uuml; Eintrags</a></span></dt>
@@ -113,7 +126,11 @@
                <dt><span class="section"><a href="uninstall-Mageia.html">Mageia deinstallieren</a></span></dt>
                <dd>
                   <dl>
+<<<<<<< HEAD
+                     <dt><span class="section"><a href="uninstall-Mageia.html#d5e1264">Kurzanleitung</a></span></dt>
+=======
                      <dt><span class="section"><a href="uninstall-Mageia.html#d5e1293">Kurzanleitung</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                   </dl>
                </dd>
             </dl>
-- 
cgit v1.2.1