aboutsummaryrefslogtreecommitdiffstats
path: root/hu/selectLanguage.html
diff options
context:
space:
mode:
Diffstat (limited to 'hu/selectLanguage.html')
-rw-r--r--hu/selectLanguage.html4
1 files changed, 0 insertions, 4 deletions
diff --git a/hu/selectLanguage.html b/hu/selectLanguage.html
index b0b4332..841a3d1 100644
--- a/hu/selectLanguage.html
+++ b/hu/selectLanguage.html
@@ -7,11 +7,7 @@
<link rel="home" href="index.html" title="Installation with DrakX">
<link rel="up" href="index.html" title="Installation with DrakX">
<link rel="prev" href="installer.html" title="DrakX, the Mageia Installer">
-<<<<<<< HEAD
<link rel="next" href="acceptLicense.html" title="Licenc &eacute;s Kiad&aacute;si megjegyz&eacute;sek"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
-=======
- <link rel="next" href="acceptLicense.html" title="Licensz &eacute;s Kiad&aacute;si megjegyz&eacute;sek"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<!--
body { font-family: sans-serif; font-size: 13px }
table { font-family: sans-serif; font-size: 13px }