Agregre linea en  el 0 Daniel
Agregre linea en  el 0 Daniel
Agregre otra cosa de conflictos
Merge remote-tracking branch 'upstream/master'

Conflicts:
	archivo-00.txt
errorres
Merge remote-tracking branch 'upstream/master'
Todos Daniel
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from Voxnox/master

Agregre linea en  el 0 Daniel