aboutsummaryrefslogtreecommitdiffstats
path: root/es/setupBootloaderAddEntry.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 /es/setupBootloaderAddEntry.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 'es/setupBootloaderAddEntry.html')
-rw-r--r--es/setupBootloaderAddEntry.html9
1 files changed, 0 insertions, 9 deletions
diff --git a/es/setupBootloaderAddEntry.html b/es/setupBootloaderAddEntry.html
index 2431cb2..c5b847d 100644
--- a/es/setupBootloaderAddEntry.html
+++ b/es/setupBootloaderAddEntry.html
@@ -27,13 +27,8 @@
-<<<<<<< HEAD
<p>Para ello, necesita editar manualmente /boot/grub2/custom.cfg o usar el
software grub-customizer (Disponible en los repositorios Mageia).
-=======
- <p>To do that you need to manually edit /boot/grub2/custom.cfg or use the
- software grub-customizer instead (Available in the Mageia repositories).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -46,11 +41,7 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Para m&aacute;s informaci&oacute;n, vea nuestro wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p>
-=======
- <p>For more information, see our wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>