aboutsummaryrefslogtreecommitdiffstats
path: root/hu/doPartitionDisks.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/doPartitionDisks.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/doPartitionDisks.html')
-rw-r--r--hu/doPartitionDisks.html3
1 files changed, 0 insertions, 3 deletions
diff --git a/hu/doPartitionDisks.html b/hu/doPartitionDisks.html
index 811400f..10950ca 100644
--- a/hu/doPartitionDisks.html
+++ b/hu/doPartitionDisks.html
@@ -221,7 +221,6 @@
</div>
-<<<<<<< HEAD
<div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -248,8 +247,6 @@
</div>
-=======
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>