aboutsummaryrefslogtreecommitdiffstats
path: root/es/setupBootloaderAddEntry.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:51:51 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:51:51 +0200
commitb3d0edb99a4723879887064280c5b6a5761322b1 (patch)
treebf83bdc5f9b797a4bdac78d45aa6d36f1fe7279b /es/setupBootloaderAddEntry.html
parent2e4709a8fe3e15cfceae673670a910aa68e115c1 (diff)
downloaddrakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.gz
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.bz2
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.xz
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.zip
Update Spanish files
Diffstat (limited to 'es/setupBootloaderAddEntry.html')
-rw-r--r--es/setupBootloaderAddEntry.html9
1 files changed, 9 insertions, 0 deletions
diff --git a/es/setupBootloaderAddEntry.html b/es/setupBootloaderAddEntry.html
index e14d534..2431cb2 100644
--- a/es/setupBootloaderAddEntry.html
+++ b/es/setupBootloaderAddEntry.html
@@ -27,8 +27,13 @@
+<<<<<<< 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>
@@ -41,7 +46,11 @@
<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>