Modifique el archivo de Chalio
no message
Merge branch 'develop' of https://github.com/luisfloresv/test into rosalio
Merge branch 'develop' of https://github.com/luisfloresv/test into rosalio
venga de nuevo
Merge pull request #15 from luisfloresv/rosalio

Rosalio
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 branch 'develop' of https://github.com/luisfloresv/test into jorge2

Conflicts:
	julio.txt