diff options
Diffstat (limited to 'nl/index.html')
| -rw-r--r-- | nl/index.html | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/nl/index.html b/nl/index.html index 4488cff..8c73f7e 100644 --- a/nl/index.html +++ b/nl/index.html @@ -28,13 +28,8 @@ <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> @@ -80,19 +75,11 @@ <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> @@ -126,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Mageia deï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> |