{"push_id":700344579,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"fe2e0dc836c0562a7dd249cd7fa48b7f80d66113","before":"29565aea0bd48585d0b9f5e7d2201f8896f923b8","commits":[{"sha":"abc3699e34b732dee2826bb5307ddadbe1e7def9","author":{"email":"80f6b3cec7140dae5ea10215bdf253cec20a3609@gmail.com","name":"hecferme"},"message":"se implementan las figuras triángulo y rectángulo y se cambian las interfaces por clases.","distinct":true,"url":"https://api.github.com/repos/hecferme/Progra-2-2015-2/commits/abc3699e34b732dee2826bb5307ddadbe1e7def9"},{"sha":"fe2e0dc836c0562a7dd249cd7fa48b7f80d66113","author":{"email":"80f6b3cec7140dae5ea10215bdf253cec20a3609@gmail.com","name":"hecferme"},"message":"Merge origin/master\n\nConflicts:\n\tCalentamiento/src/Inheritance/Nivel2/ITriangulo.java\n\tCalentamiento/src/Inheritance/Nivel2/Triangulo.java","distinct":true,"url":"https://api.github.com/repos/hecferme/Progra-2-2015-2/commits/fe2e0dc836c0562a7dd249cd7fa48b7f80d66113"}]}