{"push_id":943936145,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"71a3120f0bf86906ff50d6ae83e3101f932b5d33","before":"390553ceb8f210412153351388c78993176dba6d","commits":[{"sha":"2b1851ed82479dd65891f02aad117eb56c7ae147","author":{"email":"f7f4a4be84ad851237ca90fa56d0de6cfec61d3a@gmail.com","name":"TychoBraams"},"message":"conflict resolution","distinct":true,"url":"https://api.github.com/repos/tlbraams/Qwirkle/commits/2b1851ed82479dd65891f02aad117eb56c7ae147"},{"sha":"71a3120f0bf86906ff50d6ae83e3101f932b5d33","author":{"email":"f7f4a4be84ad851237ca90fa56d0de6cfec61d3a@gmail.com","name":"TychoBraams"},"message":"Merge branch 'master' of https://github.com/tlbraams/Qwirkle\n\nConflicts:\n\tQwirkle/src/controller/Game.java","distinct":true,"url":"https://api.github.com/repos/tlbraams/Qwirkle/commits/71a3120f0bf86906ff50d6ae83e3101f932b5d33"}]}