diff options
Diffstat (limited to 'es/diskdrake.html')
| -rw-r--r-- | es/diskdrake.html | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/es/diskdrake.html b/es/diskdrake.html index f77fc58..e89be2e 100644 --- a/es/diskdrake.html +++ b/es/diskdrake.html @@ -89,14 +89,9 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Si está instalando Mageia en un ordenador con UEFI, compruebe que existe una partición ESP (EFI System Partition) correctamente montada en /boot/EFI (ver más abajo) -======= - <p>If you are installing Mageia on an UEFI system, check that an ESP (EFI - System Partition) is present and correctly mounted on /boot/EFI (see below) ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -117,13 +112,8 @@ <tr> <td align="left" valign="top"> -<<<<<<< HEAD <p>Si está instalando Mageia en un sistema Legacy/GPT, compruebe que existe una partición BIOS de arranque de tipo correcto -======= - <p>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot - partition is present with a correct type ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> |