aboutsummaryrefslogtreecommitdiffstats
path: root/es/uninstall-Mageia.html
diff options
context:
space:
mode:
Diffstat (limited to 'es/uninstall-Mageia.html')
-rw-r--r--es/uninstall-Mageia.html4
1 files changed, 0 insertions, 4 deletions
diff --git a/es/uninstall-Mageia.html b/es/uninstall-Mageia.html
index 33c5cc0..49a43f9 100644
--- a/es/uninstall-Mageia.html
+++ b/es/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<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>