prueba-charla/index.html

<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
    Cambio ya mergeado.
</body>
</html>
Agrega git ignore y template index html 2024-01-09 10:20:16 -03:00			`<!DOCTYPE html>`
			`<html lang="en">`
			`<head>`
			`<meta charset="UTF-8">`
			`<meta name="viewport" content="width=device-width, initial-scale=1.0">`
			`<title>Document</title>`
			`</head>`
			`<body>`
Resuelve el conflicto y mergea feature a master 2024-01-09 10:39:35 -03:00			`Cambio ya mergeado.`
Agrega git ignore y template index html 2024-01-09 10:20:16 -03:00			`</body>`
			`</html>`