aboutsummaryrefslogtreecommitdiffstats
path: root/hu/acceptLicense.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:53:28 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:53:28 +0200
commitfbd9dfd8acd9dedd07332fa4a48c152f6b9490a8 (patch)
tree58a4e95dec3ffaf6f522568095d47085b0367d25 /hu/acceptLicense.html
parent8f7de370a7103f809917a71bc24ca1b16543f06e (diff)
downloaddrakx-installer-help-fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8.tar
drakx-installer-help-fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8.tar.gz
drakx-installer-help-fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8.tar.bz2
drakx-installer-help-fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8.tar.xz
drakx-installer-help-fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8.zip
Update Hungarian files
Diffstat (limited to 'hu/acceptLicense.html')
-rw-r--r--hu/acceptLicense.html12
1 files changed, 12 insertions, 0 deletions
diff --git a/hu/acceptLicense.html b/hu/acceptLicense.html
index 1e572ef..e8cb012 100644
--- a/hu/acceptLicense.html
+++ b/hu/acceptLicense.html
@@ -2,7 +2,11 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<<<<<<< HEAD
+ <title>Licenc &eacute;s Kiad&aacute;si megjegyz&eacute;sek</title>
+=======
<title>Licensz &eacute;s Kiad&aacute;si megjegyz&eacute;sek</title>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Installation with DrakX">
<link rel="up" href="index.html" title="Installation with DrakX">
@@ -13,11 +17,19 @@
table { font-family: sans-serif; font-size: 13px }
--></style></head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<<<<<<< HEAD
+ <div lang="hu" class="section" title="Licenc &eacute;s Kiad&aacute;si megjegyz&eacute;sek">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h2 class="title"><a name="acceptLicense"></a>Licenc &eacute;s Kiad&aacute;si megjegyz&eacute;sek
+=======
<div lang="hu" class="section" title="Licensz &eacute;s Kiad&aacute;si megjegyz&eacute;sek">
<div class="titlepage">
<div>
<div>
<h2 class="title"><a name="acceptLicense"></a>Licensz &eacute;s Kiad&aacute;si megjegyz&eacute;sek
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h2>
</div>
</div>