diff options
| author | Papoteur <papoteur@mageialinux-online.org> | 2017-06-06 07:50:24 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageialinux-online.org> | 2017-06-06 07:50:24 +0200 |
| commit | a979860a232ea8759dc5e6b72074051c9f64b6f8 (patch) | |
| tree | 908282b77f16f0bc3869f2c0daccd42dbccf1cfa /ca/index.html | |
| parent | 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 (diff) | |
| download | drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar.gz drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar.bz2 drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar.xz drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.zip | |
Update Catalan files
Diffstat (limited to 'ca/index.html')
| -rw-r--r-- | ca/index.html | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ca/index.html b/ca/index.html index 258461c..42a49cc 100644 --- a/ca/index.html +++ b/ca/index.html @@ -75,11 +75,19 @@ <dt><span class="section"><a href="setupBootloader.html">Opcions principals del menú d'arrencada</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">Ús del gestor d'arrencada de Mageia</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e924">Ús d'un gestor d'arrencada existent</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e927">Using chain loading</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e941">Opcions</a></span></dt> +======= <dt><span class="section"><a href="setupBootloader.html#d5e900">Bootloader interface</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e930">Ús del gestor d'arrencada de Mageia</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e947">Ús d'un gestor d'arrencada existent</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e950">Using the chain loading</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e967">Opcions</a></span></dt> +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Addició o modificació d'una entrada al menú d'arrencada</a></span></dt> @@ -113,7 +121,11 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Desinstal·lació de 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#d5e1273">Howto</a></span></dt> +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> |