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>