aboutsummaryrefslogtreecommitdiffstats
path: root/nl/index.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:04:44 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:04:44 +0200
commit61d14499c51b1be91d41330a07ad6f3f9cb8b815 (patch)
treed04c37a49e930585e2f887fe85afdcf2c33f53e5 /nl/index.html
parent9606ddfee543795d8208e2df7edb8a58b2f262c5 (diff)
downloaddrakx-installer-help-61d14499c51b1be91d41330a07ad6f3f9cb8b815.tar
drakx-installer-help-61d14499c51b1be91d41330a07ad6f3f9cb8b815.tar.gz
drakx-installer-help-61d14499c51b1be91d41330a07ad6f3f9cb8b815.tar.bz2
drakx-installer-help-61d14499c51b1be91d41330a07ad6f3f9cb8b815.tar.xz
drakx-installer-help-61d14499c51b1be91d41330a07ad6f3f9cb8b815.zip
Add Dutch files
Diffstat (limited to 'nl/index.html')
-rw-r--r--nl/index.html17
1 files changed, 17 insertions, 0 deletions
diff --git a/nl/index.html b/nl/index.html
index ec68129..4488cff 100644
--- a/nl/index.html
+++ b/nl/index.html
@@ -28,8 +28,13 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introductie</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Media</a></span></dt>
+<<<<<<< HEAD
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Een medium downloaden en checken</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Brand of dump het ISO</a></span></dt>
+=======
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Een medium downloaden en checken</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Brand of dump het ISO</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, het Mageia-installatieprogramma</a></span></dt>
@@ -75,11 +80,19 @@
<dt><span class="section"><a href="setupBootloader.html">Algemene opties voor de opstartlader</a></span></dt>
<dd>
<dl>
+<<<<<<< HEAD
+ <dt><span class="section"><a href="setupBootloader.html#d5e882">Opstartlader Interface</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e906">De Mageia-opstartlader gebruiken</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e920">Een bestaande opstartlader gebruiken</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e923">Met behulp van opeenvolgend laden</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e937">Opties</a></span></dt>
+=======
<dt><span class="section"><a href="setupBootloader.html#d5e885">Opstartlader Interface</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e909">De Mageia-opstartlader gebruiken</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e923">Een bestaande opstartlader gebruiken</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e926">Met behulp van opeenvolgend laden</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e940">Opties</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Wijzig een opstartmenu-ingang of voeg er een toe</a></span></dt>
@@ -113,7 +126,11 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Mageia de&iuml;nstalleren</a></span></dt>
<dd>
<dl>
+<<<<<<< HEAD
+ <dt><span class="section"><a href="uninstall-Mageia.html#d5e1243">Howto</a></span></dt>
+=======
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1246">Howto</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>