diff options
Diffstat (limited to 'hu/choosePackageGroups.html')
| -rw-r--r-- | hu/choosePackageGroups.html | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/hu/choosePackageGroups.html b/hu/choosePackageGroups.html index a046ba9..fa7131c 100644 --- a/hu/choosePackageGroups.html +++ b/hu/choosePackageGroups.html @@ -22,7 +22,6 @@ </div> </div> </div> -<<<<<<< HEAD @@ -30,23 +29,12 @@ -======= - - - - - - - - ->>>>>>> 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"> @@ -80,40 +68,6 @@ minimal install (without or with X & IceWM). </p> -======= - - <div class="itemizedlist"> - <ul class="itemizedlist"> - <li class="listitem"> - - <p>Munkaállomás.</p> - - </li> - <li class="listitem"> - - <p>Kiszolgáló.</p> - - </li> - <li class="listitem"> - - <p>Grafikus kö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">„Minimal Install”</a> for instructions on how to do a - minimal install (without or with X & IceWM). - </p> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </body> </html> |