Comentario con ñ
commit mafe
Se hace una subida test.
Prueba commit
Curso GIT actualizando archivo
ii
Prueba actividad colaboratida Hector
Adiciono nuevos ficheros para ultima capacitacion
Merge remote-tracking branch 'origin/mafe-rodriguez' into v3.0
Merge remote-tracking branch 'origin/juliandavid' into v3.0
Merge remote-tracking branch 'origin/ramaClase3' into v3.0
Merge remote-tracking branch 'origin/TICKET-JC-1' into v3.0

Conflicts:
	basic.html
Merge remote-tracking branch 'origin/newRama' into v3.0
Merge remote-tracking branch 'origin/hectorusma' into v3.0
Merge remote-tracking branch 'origin/nataliabocanegra' into v3.0

Conflicts:
	basic.html