1 files changed, 0 insertions, 12 deletions
diff --git a/cs/addUser.html b/cs/addUser.html
index 7d9f16b..297b530 100644
--- a/cs/addUser.html
+++ b/cs/addUser.html
@@ -23,16 +23,8 @@
             </div>
          </div>
            
-<<<<<<< HEAD
            
            
-=======
-         
-           
-         
-           
-         
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="Nastaven&iacute; hesla spr&aacute;vce (u&#382;ivatele root):">
             <div class="titlepage">
@@ -146,10 +138,6 @@
                         <p>Jak&yacute;koliv u&#382;ivatel p&#345;idan&yacute; v pr&#367;b&#283;hu instalace Mageii bude m&iacute;t chr&aacute;n&#283;n
                            domovsk&yacute; adres&aacute;&#345; proti &#269;ten&iacute; a z&aacute;pisu (umask=0027)
                         </p>
-<<<<<<< HEAD
-=======
-                        
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                               
                         <p>M&#367;&#382;ete p&#345;idat v&#353;echny dal&#353;&iacute; pot&#345;ebn&eacute; u&#382;ivatele v kroku <span class="emphasis"><em>Nastaven&iacute; -
                                  Souhrn</em></span> b&#283;hem instalace. Vyberte si <span class="emphasis"><em>Spr&aacute;va