Update Hungarian files

1 files changed, 46 insertions, 0 deletions

diff --git a/hu/choosePackageGroups.html b/hu/choosePackageGroups.html
index 0dbf708..a046ba9 100644
--- a/hu/choosePackageGroups.html
+++ b/hu/choosePackageGroups.html
@@ -22,6 +22,15 @@
                </div>
             </div>
          </div>
+<<<<<<< HEAD
+           
+         
+           
+         
+           
+         
+           
+=======
          
              
          
@@ -30,12 +39,48 @@
          
          
              
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <p>Packages have been sorted into groups, to make choosing what you need on
             your system a lot easier. The groups are fairly self explanatory, however
             more information about the content of each is available in tool-tips which
             become visible as the mouse is hovered over them.
          </p>
          
+<<<<<<< HEAD
+           
+         <div class="itemizedlist">
+            <ul class="itemizedlist">
+               <li class="listitem">
+                        
+                  <p>Munka&aacute;llom&aacute;s.</p>
+                      
+               </li>
+               <li class="listitem">
+                        
+                  <p>Kiszolg&aacute;l&oacute;.</p>
+                      
+               </li>
+               <li class="listitem">
+                        
+                  <p>Grafikus k&ouml;rnyezet</p>
+                      
+               </li>
+               <li class="listitem">
+                        
+                  <p>Individual Package Selection: You can use this option to manually add or
+                     remove packages.
+                  </p>
+                      
+               </li>
+            </ul>
+         </div>
+         
+           
+         <p>Read <a class="xref" href="minimal-install.html" title="Minimal Install">&#8222;Minimal Install&#8221;</a> for instructions on how to do a
+            minimal install (without or with X &amp; IceWM).
+         </p>
+         
+=======
              
          <div class="itemizedlist">
             <ul class="itemizedlist">
@@ -68,6 +113,7 @@
             minimal install (without or with X &amp; IceWM).
          </p> 
            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
       </div>
    </body>
 </html>