chao
conflicto
Conflict merge
Merge branch 'fran2'

Conflicts:
	hola.txt