aboutsummaryrefslogtreecommitdiffstats
path: root/de/index.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
commit984a084705f358bc9799d634eb81427e81982051 (patch)
tree73c16dffc5c3134cdf85a94c26c8564b972789e1 /de/index.html
parentc26420407d1f1a586b943c41977152969c5eec0c (diff)
downloaddrakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.gz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.bz2
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.xz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.zip
Update translations
Diffstat (limited to 'de/index.html')
-rw-r--r--de/index.html17
1 files changed, 0 insertions, 17 deletions
diff --git a/de/index.html b/de/index.html
index bfa490e..ad9b410 100644
--- a/de/index.html
+++ b/de/index.html
@@ -28,13 +28,8 @@
<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>
@@ -80,19 +75,11 @@
<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>
@@ -126,11 +113,7 @@
<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>