diff options
Diffstat (limited to 'hu/diskdrake.html')
| -rw-r--r-- | hu/diskdrake.html | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/hu/diskdrake.html b/hu/diskdrake.html index 159d44c..7094539 100644 --- a/hu/diskdrake.html +++ b/hu/diskdrake.html @@ -29,21 +29,6 @@ -<<<<<<< HEAD -======= - - - - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> <tr> @@ -104,11 +89,7 @@ <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> @@ -119,7 +100,6 @@ </table> </div> -<<<<<<< HEAD <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -141,8 +121,6 @@ </table> </div> -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </body> </html> |