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/soundConfig.html | 28 ----------------------------
 1 file changed, 28 deletions(-)

(limited to 'hu/soundConfig.html')

diff --git a/hu/soundConfig.html b/hu/soundConfig.html
index c2ae706..518b063 100644
--- a/hu/soundConfig.html
+++ b/hu/soundConfig.html
@@ -22,10 +22,6 @@
                </div>
             </div>
          </div>
-<<<<<<< HEAD
-=======
-         
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          
            
@@ -36,35 +32,21 @@
          <p>In this screen the name of the driver that the installer chose for your
             sound card is given, which will be the default driver if we have a default
             one.
-<<<<<<< HEAD
          </p>
          
-=======
-              
-         </p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <p>The default driver should work without problems. However, if after install
             you do encounter problems, then run <span class="command"><strong>draksound</strong></span> or start
             this tool via MCC (Mageia Control Center), by choosing the
             <span class="guilabel">Hardware</span> tab and clicking on <span class="guilabel">Sound
                Configuration</span> at the top right of the screen.
-<<<<<<< HEAD
          </p>
          
-=======
-              
-         </p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <p>Then, in the draksound or "Sound Configuration" tool screen, click on
             <span class="guibutton">Advanced</span> and then on
             <span class="guibutton">Troubleshooting</span> to find very useful advice about how
             to solve the problem.
-<<<<<<< HEAD
-=======
-              
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          </p>
          
            
@@ -83,22 +65,12 @@
             <p>Clicking <span class="guibutton">Advanced</span> in this screen, during install, is
                useful if there is no default driver and there are several drivers
                available, but you think the installer selected the wrong one.
-<<<<<<< HEAD
-=======
-                   
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             </p>
             
                 
             <p>In that case you can select a different driver after clicking on
                <span class="guibutton">Let me pick any driver</span>.
-<<<<<<< HEAD
             </p>
-=======
-                   
-            </p>
-            
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
               
          </div>
          
-- 
cgit v1.2.1