From 320d202f1fae239f8bb8cf041866011ab3456d7f Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Tue, 6 Jun 2017 07:51:07 +0200
Subject: Update German files

---
 de/uninstall-Mageia.html | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/de/uninstall-Mageia.html b/de/uninstall-Mageia.html
index b23d08b..14aed30 100644
--- a/de/uninstall-Mageia.html
+++ b/de/uninstall-Mageia.html
@@ -31,7 +31,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e1264"></a>Kurzanleitung
+=======
                      <h3 class="title"><a name="d5e1293"></a>Kurzanleitung
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
-- 
cgit v1.2.1