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