aboutsummaryrefslogtreecommitdiffstats
path: root/hu/uninstall-Mageia.html
diff options
context:
space:
mode:
Diffstat (limited to 'hu/uninstall-Mageia.html')
-rw-r--r--hu/uninstall-Mageia.html4
1 files changed, 0 insertions, 4 deletions
diff --git a/hu/uninstall-Mageia.html b/hu/uninstall-Mageia.html
index cc6c70a..d486a27 100644
--- a/hu/uninstall-Mageia.html
+++ b/hu/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1247"></a>Howto
-=======
- <h3 class="title"><a name="d5e1206"></a>Howto
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>