aboutsummaryrefslogtreecommitdiffstats
path: root/es/uninstall-Mageia.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:51:51 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:51:51 +0200
commitb3d0edb99a4723879887064280c5b6a5761322b1 (patch)
treebf83bdc5f9b797a4bdac78d45aa6d36f1fe7279b /es/uninstall-Mageia.html
parent2e4709a8fe3e15cfceae673670a910aa68e115c1 (diff)
downloaddrakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.gz
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.bz2
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.xz
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.zip
Update Spanish files
Diffstat (limited to 'es/uninstall-Mageia.html')
-rw-r--r--es/uninstall-Mageia.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/es/uninstall-Mageia.html b/es/uninstall-Mageia.html
index 4df334b..33c5cc0 100644
--- a/es/uninstall-Mageia.html
+++ b/es/uninstall-Mageia.html
@@ -31,7 +31,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h3 class="title"><a name="d5e1238"></a>Guias
+=======
<h3 class="title"><a name="d5e1241"></a>Guias
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>