1 files changed, 0 insertions, 22 deletions
diff --git a/es/selectCountry.html b/es/selectCountry.html
index 039c750..df8d7dc 100644
--- a/es/selectCountry.html
+++ b/es/selectCountry.html
@@ -29,15 +29,9 @@
            
          
            
-<<<<<<< HEAD
          <p><a name="selectCountry-pa1"></a>Elija su pa&iacute;s o regi&oacute;n. Esto es importante para todo tipo de
             configuraciones, como la moneda o la red wifi. Elegir el pa&iacute;s incorrecto
             puede hacer que no pueda usar una red inal&aacute;mbrica.
-=======
-         <p><a name="selectCountry-pa1"></a>Select your country or region.  This is important for all kinds of settings,
-            like the currency and wireless regulatory domain. Setting the wrong country
-            can lead to not being able to use a Wireless network.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          </p>
          
            
@@ -79,7 +73,6 @@
                 
             
                 
-<<<<<<< HEAD
             <p><a name="selectCountry-pa4"></a>En la pantalla <span class="guilabel">Otros pa&iacute;ses</span> tambi&eacute;n puede seleccionar
                un m&eacute;todo de entrada (en la parte inferior de la lista). Los m&eacute;todos de
                entrada permiten a los usuarios introducir caracteres multiling&uuml;es (chino,
@@ -87,15 +80,6 @@
                que los usuarios no deben configurarlo manualmente. Otros m&eacute;todos de entrada
                (SCIM, GCIN, HIME, etc) tambi&eacute;n proporcionan funciones similares y se pueden
                instalar si agreg&oacute; medios HTTP / FTP antes de la selecci&oacute;n de paquetes.
-=======
-            <p><a name="selectCountry-pa4"></a>In the <span class="guilabel">Other Countries</span> screen you can also select an
-               input method (at the bottom of the list). Input methods allow users to input
-               multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
-               default input method, so users should not need to configure it
-               manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar
-               functions and can be installed if you added HTTP/FTP media before package
-               selection.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             </p>
             
                 
@@ -108,15 +92,9 @@
                   <tr>
                      <td align="left" valign="top">
                               
-<<<<<<< HEAD
                         <p><a name="selectCountry-pa5"></a>Si se perdi&oacute; la configuraci&oacute;n del m&eacute;todo de entrada durante la instalaci&oacute;n,
                            puede acceder a ella despu&eacute;s de arrancar el sistema instalado a trav&eacute;s de
                            "Configurar su computadora" -&gt; "Sistema" o ejecutando localedrake como root.
-=======
-                        <p><a name="selectCountry-pa5"></a>If you missed the input method setup during installation, you can access it
-                           after you boot your installed system via "Configure your Computer" -&gt;
-                           "System", or by running localedrake as root.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </p>
                             
                      </td>