From 3c587a150c7a5b6776557f4e9da803138871718c Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Tue, 6 Jun 2017 08:11:51 +0200
Subject: Update English files

---
 uninstall-Mageia.html | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'uninstall-Mageia.html')

diff --git a/uninstall-Mageia.html b/uninstall-Mageia.html
index 1450834..69dabb1 100644
--- a/uninstall-Mageia.html
+++ b/uninstall-Mageia.html
@@ -30,7 +30,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e1267"></a>Howto
+=======
                      <h3 class="title"><a name="d5e1252"></a>Howto
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -45,9 +49,10 @@
             </p>
             
                 
-            <p>After your data backup, reboot your installation Mageia DVD and select Rescue
-                   system, then, Restore Windows boot loader. At the next boot, you will only
-                   have Windows with no option to choose your operating system.
+            <p>After your data backup, reboot your installation Mageia DVD and
+                   select Rescue system, then, Restore Windows boot loader. At the next boot,
+                   you will only have Windows with no option to choose your operating
+                   system.
             </p>
             
                 
@@ -61,8 +66,8 @@
             </p>
             
                 
-            <p>If you are using Windows XP, you can create a new partition and format it (FAT32
-                   or NTFS). It will get a partition letter.
+            <p>If you are using Windows XP, you can create a new partition and
+                   format it (FAT32 or NTFS). It will get a partition letter.
             </p>
             
                 
-- 
cgit v1.2.1