diff options
Diffstat (limited to 'hu/index.html')
| -rw-r--r-- | hu/index.html | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/hu/index.html b/hu/index.html index e1ca433..d1b4f0c 100644 --- a/hu/index.html +++ b/hu/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Bevezetés</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#d5e122">Downloading and Checking Media</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Burn or dump the ISO</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e142">Downloading and Checking Media</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e169">Burn or dump the ISO</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, the Mageia Installer</a></span></dt> @@ -45,11 +40,7 @@ </dl> </dd> <dt><span class="section"><a href="selectLanguage.html">Válasszon nyelvet</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="acceptLicense.html">Licenc és Kiadási megjegyzések</a></span></dt> -======= - <dt><span class="section"><a href="acceptLicense.html">Licensz és Kiadási megjegyzések</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <dd> <dl> <dt><span class="section"><a href="acceptLicense.html#license">Licencegyezmény</a></span></dt> @@ -84,7 +75,6 @@ <dt><span class="section"><a href="setupBootloader.html">Rendszerindítási beállítások</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e886">Bootloader interface</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e910">Using a Mageia bootloader</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e924">Using an existing bootloader</a></span></dt> @@ -93,19 +83,6 @@ </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Add or Modify a Boot Menu Entry</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e899">With a Bios system</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e936">With an UEFI system</a></span></dt> - </dl> - </dd> - <dt><span class="section"><a href="setupBootloaderAddEntry.html">Add or Modify a Boot Menu Entry</a></span></dt> - <dd> - <dl> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e951">With a Bios system</a></span></dt> - <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e968">With an UEFI system</a></span></dt> - </dl> - </dd> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <dt><span class="section"><a href="misc-params.html">Summary of miscellaneous parameters</a></span></dt> <dd> <dl> @@ -136,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Uninstalling Mageia</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1247">Howto</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1206">Howto</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> |