aboutsummaryrefslogtreecommitdiffstats
path: root/es/choosePackageGroups.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:51:51 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:51:51 +0200
commitb3d0edb99a4723879887064280c5b6a5761322b1 (patch)
treebf83bdc5f9b797a4bdac78d45aa6d36f1fe7279b /es/choosePackageGroups.html
parent2e4709a8fe3e15cfceae673670a910aa68e115c1 (diff)
downloaddrakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.gz
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.bz2
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.tar.xz
drakx-installer-help-b3d0edb99a4723879887064280c5b6a5761322b1.zip
Update Spanish files
Diffstat (limited to 'es/choosePackageGroups.html')
-rw-r--r--es/choosePackageGroups.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/es/choosePackageGroups.html b/es/choosePackageGroups.html
index ef87363..1bd1a5a 100644
--- a/es/choosePackageGroups.html
+++ b/es/choosePackageGroups.html
@@ -64,8 +64,13 @@
</div>
+<<<<<<< HEAD
+ <p>Lea <a class="xref" href="minimal-install.html" title="Instalaci&oacute;n m&iacute;nima.">&#8220;Instalaci&oacute;n m&iacute;nima.&#8221;</a> para obtener instrucciones sobre
+ c&oacute;mo realizar una instalaci&oacute;n m&iacute;nima (sin o con X &amp; IceWM).
+=======
<p>Read <a class="xref" href="minimal-install.html" title="Instalaci&oacute;n m&iacute;nima.">&#8220;Instalaci&oacute;n m&iacute;nima.&#8221;</a> for instructions on how to do a
minimal install (without or with X &amp; IceWM).
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</div>