aboutsummaryrefslogtreecommitdiffstats
path: root/hu/acceptLicense.html
diff options
context:
space:
mode:
Diffstat (limited to 'hu/acceptLicense.html')
-rw-r--r--hu/acceptLicense.html12
1 files changed, 0 insertions, 12 deletions
diff --git a/hu/acceptLicense.html b/hu/acceptLicense.html
index e8cb012..542c121 100644
--- a/hu/acceptLicense.html
+++ b/hu/acceptLicense.html
@@ -2,11 +2,7 @@
<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">
@@ -17,19 +13,11 @@
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>