{"push_id":929161964,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"3df3edcf34ef5d3d2029c11051d759f223afc023","before":"a06963d9e6de89e40484fe7d0a990b155dcd5021","commits":[{"sha":"1046c0003e7a0e6c2911db5985d205a3fadd7835","author":{"email":"2b977e90b62caf90d108430976351fd426d608ef@qq.com","name":"YingshanGuo"},"message":"2016-1-10","distinct":true,"url":"https://api.github.com/repos/Yoko-Kael-2016/Yoko-Kael/commits/1046c0003e7a0e6c2911db5985d205a3fadd7835"},{"sha":"3df3edcf34ef5d3d2029c11051d759f223afc023","author":{"email":"2b977e90b62caf90d108430976351fd426d608ef@qq.com","name":"YingshanGuo"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tTestForDataBase/lib/jfinal-2.1-bin.jar\n\tTestForDataBase/lib/mysql-connector-java-5.1.7-bin.jar\n\tTestForDataBase/libs/jfinal-2.1-bin.jar\n\tTestForDataBase/libs/mysql-connector-java-5.1.7-bin.jar\n\tTestFotDataBase/lib/jfinal-2.1-bin.jar\n\tTestFotDataBase/lib/mysql-connector-java-5.1.7-bin.jar","distinct":true,"url":"https://api.github.com/repos/Yoko-Kael-2016/Yoko-Kael/commits/3df3edcf34ef5d3d2029c11051d759f223afc023"}]}