GitHub PushEvent at 2014-06-07 21:23:10
Repository: TareaI-INFO175
Actor: ehuenuman
Payload: {"shas":[["eb0bbb94cc92b11ea8d7132520e5f2973824796b","6d02f531cb4ed41decc952d3ba4bcd212795708a@hotmail.cl","Añadida la extensión .pi~ para ser ignorada","ehuenuman",true],["98259673937a26e2aec6f0278b9b9638ccbeb5f8","6d02f531cb4ed41decc952d3ba4bcd212795708a@hotmail.cl","Merge branch 'master' of https://github.com/ehuenuman/TareaI-INFO175\n\nAhora hacemos un merge recursivo para poder solucionar los conflictos que se\ngeneraron al realizar un merge entre la rama grillamanuel y master.","ehuenuman",true],["427040e08f473cf0d57925623fcb0eef43632180","6d02f531cb4ed41decc952d3ba4bcd212795708a@hotmail.cl","Solucionado el problema entre el HEAD y master","ehuenuman",true],["a30d295cfda786b0f33d61edff5c54989c833ab8","6d02f531cb4ed41decc952d3ba4bcd212795708a@hotmail.cl","Base de datos de los productos","ehuenuman",true]],"size":4,"ref":"refs/heads/master","head":"a30d295cfda786b0f33d61edff5c54989c833ab8"}