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