GitHub PushEvent at 2014-11-11 15:23:25
Repository: testegit
Actor: jotafelipe
Payload: {"shas":[["c05973d4f2f5e368ff2286ce04faebceea1a9058","26ad66078e93bef086744056c15fdfd5ef8f7118@fliegersoftware.de","b","Juliano A. Felipe",true],["15ffe3ba9666cc3d4775d53a35821c358581645c","26ad66078e93bef086744056c15fdfd5ef8f7118@fliegersoftware.de","Merge branch 'master' of\nhttps://jotafelipe@github.com/jotafelipe/testegit.git\n\nConflicts:\n\tTesteGit/src/teste.java","Juliano A. Felipe",true]],"size":2,"ref":"refs/heads/master","head":"15ffe3ba9666cc3d4775d53a35821c358581645c"}