From 984a084705f358bc9799d634eb81427e81982051 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Sun, 25 Jun 2017 18:38:09 +0200
Subject: Update translations

---
 ca/uninstall-Mageia.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'ca/uninstall-Mageia.html')

diff --git a/ca/uninstall-Mageia.html b/ca/uninstall-Mageia.html
index 7e4d71f..4491900 100644
--- a/ca/uninstall-Mageia.html
+++ b/ca/uninstall-Mageia.html
@@ -31,11 +31,7 @@
             <div class="titlepage">
                <div>
                   <div>
-<<<<<<< HEAD
-                     <h3 class="title"><a name="d5e1247"></a>Howto
-=======
-                     <h3 class="title"><a name="d5e1273"></a>Howto
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+                     <h3 class="title"><a name="d5e1244"></a>Howto
                      </h3>
                   </div>
                </div>
-- 
cgit v1.2.1