{"push_id":2658431662,"size":3,"distinct_size":1,"ref":"refs/heads/master","head":"30448d6d4139c014d3c612025c2734a2f3e5a6b9","before":"f2451086e0c445cef2d56355256498db23f00a0a","commits":[{"sha":"90ba1937d1508c93e09c7e948ef342a4133ef29a","author":{"name":"GitHub Teacher","email":"6ab9c4b76037c547516cb30bc54710e0b0ff7b81@github.com"},"message":"Add GitHub Teacher info to config file","distinct":false,"url":"https://api.github.com/repos/sebastianthiel/merge-conflict/commits/90ba1937d1508c93e09c7e948ef342a4133ef29a"},{"sha":"a8de9bd8a5baf6ffac6419814c29cefd8f533027","author":{"name":"Sebastian Thiel","email":"6ff11f7be8a53ad8d64538c17dbb8deca26e18aa@sae.edu"},"message":"Merge branch 'master' into update-config","distinct":false,"url":"https://api.github.com/repos/sebastianthiel/merge-conflict/commits/a8de9bd8a5baf6ffac6419814c29cefd8f533027"},{"sha":"30448d6d4139c014d3c612025c2734a2f3e5a6b9","author":{"name":"Sebastian Thiel","email":"6ff11f7be8a53ad8d64538c17dbb8deca26e18aa@sae.edu"},"message":"Merge pull request #1 from sebastianthiel/update-config\n\nSecond merge: Let's try a conflict","distinct":true,"url":"https://api.github.com/repos/sebastianthiel/merge-conflict/commits/30448d6d4139c014d3c612025c2734a2f3e5a6b9"}]}
{"actor":{"display_login":"sebastianthiel"}}