diff options
Diffstat (limited to 'hu/diskdrake.html')
| -rw-r--r-- | hu/diskdrake.html | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/hu/diskdrake.html b/hu/diskdrake.html index a55236e..159d44c 100644 --- a/hu/diskdrake.html +++ b/hu/diskdrake.html @@ -29,6 +29,8 @@ +<<<<<<< HEAD +======= @@ -41,6 +43,7 @@ +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> <tr> @@ -101,7 +104,11 @@ <td align="left" valign="top"> <p>If you are installing Mageia on an UEFI system, check that an ESP (EFI +<<<<<<< HEAD + System Partition) is present and correctly mounted on /boot/EFI (see below) +======= System Partition) is present and correctly mounted on /boot/EFI (see above) +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> @@ -112,6 +119,30 @@ </table> </div> +<<<<<<< HEAD + + <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> + <table border="0" summary="Note"> + <tr> + <td rowspan="2" align="center" valign="top" width="25"><img alt="[Megjegyzés]" src="note.png"></td> + <th align="left"></th> + </tr> + <tr> + <td align="left" valign="top"> + + <p>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot + partition is present with a correct type + </p> + + + + </td> + </tr> + </table> + </div> + +======= +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </body> </html> |