aboutsummaryrefslogtreecommitdiffstats
path: root/eu/uninstall-Mageia.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:52:40 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:52:40 +0200
commit30d1363f3cad97492df9e9f02d9e191186ce7d11 (patch)
treeb63f47f7362a6f28afeeb4ed39e89ef6d9f7959a /eu/uninstall-Mageia.html
parent42e8b791d07c0e8da8e3ebe37dda933cd5cf27cc (diff)
downloaddrakx-installer-help-30d1363f3cad97492df9e9f02d9e191186ce7d11.tar
drakx-installer-help-30d1363f3cad97492df9e9f02d9e191186ce7d11.tar.gz
drakx-installer-help-30d1363f3cad97492df9e9f02d9e191186ce7d11.tar.bz2
drakx-installer-help-30d1363f3cad97492df9e9f02d9e191186ce7d11.tar.xz
drakx-installer-help-30d1363f3cad97492df9e9f02d9e191186ce7d11.zip
Update Basque files
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>