aboutsummaryrefslogtreecommitdiffstats
path: root/fr/index.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
commit984a084705f358bc9799d634eb81427e81982051 (patch)
tree73c16dffc5c3134cdf85a94c26c8564b972789e1 /fr/index.html
parentc26420407d1f1a586b943c41977152969c5eec0c (diff)
downloaddrakx-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 'fr/index.html')
-rw-r--r--fr/index.html18
1 files changed, 0 insertions, 18 deletions
diff --git a/fr/index.html b/fr/index.html
index 3391861..c4306b3 100644
--- a/fr/index.html
+++ b/fr/index.html
@@ -75,7 +75,6 @@
<dt><span class="section"><a href="setupBootloader.html">Principales options du chargeur de d&eacute;marrage</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e911">Interface du programme d'amor&ccedil;age</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e939">Utiliser un chargeur de d&eacute;marrage Mageia</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e955">Utiliser un chargeur de d&eacute;marrage existant. </a></span></dt>
@@ -84,19 +83,6 @@
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Ajouter ou Modifier une Entr&eacute;e de Menu de D&eacute;marrage</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e918">Avec un syst&egrave;me BIOS</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e955">Avec un syst&egrave;me UEFI</a></span></dt>
- </dl>
- </dd>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html">Ajouter ou Modifier une Entr&eacute;e de Menu de D&eacute;marrage</a></span></dt>
- <dd>
- <dl>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e974">Avec un syst&egrave;me BIOS</a></span></dt>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e991">Avec un syst&egrave;me UEFI</a></span></dt>
- </dl>
- </dd>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<dt><span class="section"><a href="misc-params.html">R&eacute;sum&eacute; des diff&eacute;rents param&egrave;tres</a></span></dt>
<dd>
<dl>
@@ -127,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">D&eacute;sinstaller Mageia</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1281">Guide</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1230">Guide</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>