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

---
 hu/chooseDesktop.html | 28 ----------------------------
 1 file changed, 28 deletions(-)

(limited to 'hu/chooseDesktop.html')

diff --git a/hu/chooseDesktop.html b/hu/chooseDesktop.html
index 289b098..f5e9430 100644
--- a/hu/chooseDesktop.html
+++ b/hu/chooseDesktop.html
@@ -22,49 +22,25 @@
                </div>
             </div>
          </div>
-<<<<<<< HEAD
            
          
          
            
          
            
-=======
-         
-         
-             
-         
-         
-          
-         
-         
-             
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <p>Depending on your selection here, you may be offered further screens to fine
             tune your choice.
          </p>
          
-<<<<<<< HEAD
            
-=======
-             
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <p>After the selection step(s), you will see a slide show during package
             installation. The slide show can be disabled by pressing the
             <span class="guilabel">Details</span> button
          </p>
          
-<<<<<<< HEAD
            
          
            
-=======
-         
-         
-         
-         
-             
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <p>Choose whether you prefer to use the <span class="application">KDE</span> or
             <span class="application">Gnome</span> desktop environment. Both come with a full
             set of useful applications and tools. Tick <span class="guilabel">Custom</span> if
@@ -73,11 +49,7 @@
             <span class="application">LXDE</span> desktop is lighter than the previous two,
             sporting less eye candy and fewer packages installed by default.
          </p>
-<<<<<<< HEAD
          
-=======
-           
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
       </div>
    </body>
 </html>
-- 
cgit v1.2.1