diff options
| author | Papoteur <papoteur@mageialinux-online.org> | 2017-06-25 18:38:09 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageialinux-online.org> | 2017-06-25 18:38:09 +0200 |
| commit | 984a084705f358bc9799d634eb81427e81982051 (patch) | |
| tree | 73c16dffc5c3134cdf85a94c26c8564b972789e1 /es/index.html | |
| parent | c26420407d1f1a586b943c41977152969c5eec0c (diff) | |
| download | drakx-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 'es/index.html')
| -rw-r--r-- | es/index.html | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/es/index.html b/es/index.html index 47ec11f..0a893c8 100644 --- a/es/index.html +++ b/es/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introducción</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Medio</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Descargando y verificando medios.</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Grabar o volcar el ISO</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Descargando y verificando medios.</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Grabar o volcar el ISO</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, el instalador de Mageia</a></span></dt> @@ -80,19 +75,11 @@ <dt><span class="section"><a href="setupBootloader.html">Opciones principales del cargador de arranque</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e877">Interfaz del cargador de arranque</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e901">Usando el cargador de arranque de Mageia</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e915">Usando un cargador de arranque existente</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e918">Carga en uso</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e932">Opciones</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e880">Bootloader interface</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e904">Usando el cargador de arranque de Mageia</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e918">Usando un cargador de arranque existente</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e921">Using chain loading</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e935">Opciones</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Agregando o modificando una entrada en el menú de arranque</a></span></dt> @@ -126,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Desinstalando Mageia</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1238">Guias</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1241">Guias</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> |