{"push_id":880091369,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"8a574e207de73e530997f912b75a0764d2aa7490","before":"afa1b9b6ec4011249bd719d9d599500bd21f1b9b","commits":[{"sha":"055e5b15471b1131a1ddd460e2e105620b4573b4","author":{"email":"e9ecf35f95dc19d7231a44d7b1c135d2150c10b8@qq.com","name":"zxf14"},"message":"again","distinct":true,"url":"https://api.github.com/repos/WillLester/UMRhai/commits/055e5b15471b1131a1ddd460e2e105620b4573b4"},{"sha":"8a574e207de73e530997f912b75a0764d2aa7490","author":{"email":"e9ecf35f95dc19d7231a44d7b1c135d2150c10b8@qq.com","name":"zxf14"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\n\t3_Coding/TransitSys/client/target/classes/edu/nju/umr/driver/UserDriver.class\n\n\t3_Coding/TransitSys/client/target/classes/edu/nju/umr/logic/accountLogic/CountLogic.class\n\n\t3_Coding/TransitSys/client/target/classes/edu/nju/umr/logic/userLogic/UserManLogic.class\n\n\t3_Coding/TransitSys/client/target/classes/edu/nju/umr/logic/workOrgManLogic/DriverManLogic.class\n\n\t3_Coding/TransitSys/client/target/classes/edu/nju/umr/logic/workOrgManLogic/OrgManLogic.class","distinct":true,"url":"https://api.github.com/repos/WillLester/UMRhai/commits/8a574e207de73e530997f912b75a0764d2aa7490"}]}