Modifique el archivo de Chalio
no message
hola
Merge branch 'develop' of https://github.com/luisfloresv/test into jorge2
Merge branch 'develop' of https://github.com/luisfloresv/test into jorge2
shimon
Merge branch 'develop' into feature_oscar

Conflicts:
	Rosalio.txt
Merge pull request #8 from luisfloresv/feature_oscar

Modifique el archivo de Chalio
Merge pull request #10 from luisfloresv/otraramajulio

no message
Merge pull request #16 from luisfloresv/Francisco

Francisco
Merge branch 'develop' of https://github.com/luisfloresv/test into jorge2

Conflicts:
	julio.txt
Merge pull request #11 from luisfloresv/jorge2

hola
Modifique, a la realidad