aboutsummaryrefslogtreecommitdiffstats
path: root/fr/uninstall-Mageia.html
diff options
context:
space:
mode:
Diffstat (limited to 'fr/uninstall-Mageia.html')
-rw-r--r--fr/uninstall-Mageia.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/fr/uninstall-Mageia.html b/fr/uninstall-Mageia.html
index 91402d7..62f2f37 100644
--- a/fr/uninstall-Mageia.html
+++ b/fr/uninstall-Mageia.html
@@ -31,7 +31,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h3 class="title"><a name="d5e1281"></a>Guide
+=======
<h3 class="title"><a name="d5e1230"></a>Guide
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>