aboutsummaryrefslogtreecommitdiffstats
path: root/es/choosePackageGroups.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
commit984a084705f358bc9799d634eb81427e81982051 (patch)
tree73c16dffc5c3134cdf85a94c26c8564b972789e1 /es/choosePackageGroups.html
parentc26420407d1f1a586b943c41977152969c5eec0c (diff)
downloaddrakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.gz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.bz2
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.xz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.zip
Update translations
Diffstat (limited to 'es/choosePackageGroups.html')
-rw-r--r--es/choosePackageGroups.html5
1 files changed, 0 insertions, 5 deletions
diff --git a/es/choosePackageGroups.html b/es/choosePackageGroups.html
index 1bd1a5a..9be94fd 100644
--- a/es/choosePackageGroups.html
+++ b/es/choosePackageGroups.html
@@ -64,13 +64,8 @@
</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>