aboutsummaryrefslogtreecommitdiffstats
path: root/hu/diskdrake.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 /hu/diskdrake.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 'hu/diskdrake.html')
-rw-r--r--hu/diskdrake.html22
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&eacute;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>