fix in search

platforms/browser/www/index.html

                             //'title':'${Artesano.Nombre}','esp': '${info}'
                             //Tries to pass all the info of each artesano into a new page, the page that display this information is 'artesano.html', not to be confused with 'artesanias.html' or 'artesanos.html'(current page)
                             //And puts this into the 'item' variable
-<<<<<<< HEAD
-                            var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["Email"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}' } })" tappable>
-=======
                             var item = ons.createElement(`<ons-list-item onclick="myNavigator.pushPage('artesano.html', { data: { title: '${Artesano.Nombre}', mun: '${Artesano.Municipio}', tel: '${Artesano["Telefono 1"]}', email: '${Artesano["E-mail"]}', esp: '${Artesano.Especificacion}', redes: '${Artesano["E-Commerce 1"]}', tecnicas: '${Artesano["Tecnica 1"]}' } })" tappable>
->>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
                         <div class="title">${Artesano.Nombre}</div>
                     </ons-list-item>`);
 
                                  //if(Esp[num] in artesanos_json.) {}
                                  results[i].Nombre = results[i].Nombre + " " + results[i]["Apellido Paterno"] + " " + results[i]["Apellido Materno"]
                                  Artesanos+=`${results[i].Nombre}|`
-<<<<<<< HEAD
-                                 ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["Email"]}|${results[i].Especificacion}&&`
-=======
                                  ArtesanosInfo+=`${results[i].Municipio}|${results[i]["Telefono 1"]}|${results[i]["E-mail"]}|${results[i].Especificacion}|${results[i]["Tecnica 1"]}&&`
->>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
                                  //`<a id='home.html'>${Artesania.artesano} | ${Artesania.municipio}</a> `
                              }
 
                                      redes = lot[4],
                                      tecnicas = lot[5];
 
-<<<<<<< HEAD
-                                 listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', redes: '${redes}'}} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
-                                 console.log(listaArt)
-=======
                                  listaArt += `<ons-item tappable onclick="myNavigator.pushPage('artesano.html', {data: {title:'${arts[i]}', mun: '${mun}', tel: '${tel}', email: '${email}', esp: '${esp}', redes: '${redes}', tecnicas: '${tecnicas}' }} )" ><div class="center">`+ arts[i] +`</div></ons-item><br>`;
->>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
                              }
 
                              if (Artesania.name == "Figuras y simbolos indigenas") {
                     for (i = 0; i < all_artesanos.length;i++){
                         all_artesanos[i].Nombre = all_artesanos[i].Nombre +  " " + all_artesanos[i]["Apellido Paterno"] + " " + all_artesanos[i]["Apellido Materno"];
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-<<<<<<< HEAD
-                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["Email"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
-=======
                         onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}', tecnicas: '${all_artesanos[i]["Tecnica 1"]}' } })" tappable>
->>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
                         <div>${all_artesanos[i].Nombre}</div>
                     </ons-list-item>`);
                         document.getElementById('results').appendChild(artesano);
                             tel = this.data.tel,
                             em = this.data.email,
                             esp = this.data.esp,
-<<<<<<< HEAD
-                            redes = this.data.redes;
-                    
-=======
                             redes = this.data.redes,
                             tecnicas = this.data.tecnicas;
->>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
 
                         //here the email is the string made from the start to where the '#' is.
                         
 
                     <h1>Colaboradores</h1>
                     
-<<<<<<< HEAD
-
-
-                    Visita nuestra <a href="https://www.icp.pr.gov/">Página Web</a> o síguenos en nuestras redes sociales: <br> <br> 
-                    <a href="https://twitter.com/icppr"><img src="img/twitter.png" alt="Twitter" style="width:35px;height:35px;border:0;">
-                    </a> 
-                    <a href="https://facebook.com/icppr"><img src="img/facebook.png" alt="Facebook" style="width:35px;height:35px;border:0;">
-                    </a>
-                    <a href="https://youtube.com/user/icppr"><img src="img/youtube.png" alt="Youtube" style="width:35px;height:35px;border:0;">
-                    </a>
-                    <a href="https://instagram.com/icppr"><img src="img/instagram.png" alt="Instagram" style="width:35px;height:35px;border:0;">
-                    </a>
-                    
-                    <br><br><br>
-                    <button onclick="redirect()">Pasar a la pagina de eventos</button>
-
-                    <script>
-                        function redirect() {
-                            location.replace("https://facebook.com/icppr")
-                        }
-                    </script>
-                    
-                    <br><br>
-=======
->>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
                     <style>
                         .column {
                             float: left;

www/index.html

                     for (i = 0; i < all_artesanos.length;i++){
                         all_artesanos[i].Nombre = all_artesanos[i].Nombre +  " " + all_artesanos[i]["Apellido Paterno"] + " " + all_artesanos[i]["Apellido Materno"];
                         var artesano = ons.createElement(`<ons-list-item class = "artists"
-<<<<<<< HEAD
-                        onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["Email"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}' } })" tappable>
-=======
                         onclick="SNavigator.pushPage('artesano.html', { data: {title: '${all_artesanos[i].Nombre}', mun: '${all_artesanos[i].Municipio}', tel: '${all_artesanos[i]["Telefono 1"]}', email: '${all_artesanos[i]["E-mail"]}', esp: '${all_artesanos[i].Especificacion}', redes: '${all_artesanos[i]["E-Commerce 1"]}', tecnicas: '${all_artesanos[i]["Tecnica 1"]}' } })" tappable>
->>>>>>> 37c3d6cd46f4836cbf2145a6b7b02f3478ec5a4c
                         <div>${all_artesanos[i].Nombre}</div>
                     </ons-list-item>`);
                         document.getElementById('results').appendChild(artesano);