{"ref":"refs/heads/master","push_id":54816342,"commits":[{"sha":"13e791d47fb781be5a5f3c175b6fbb2c0c31d9a4","author":{"email":"247cfcf4924b6feed004ec5a2d822bb35b8f8aea@gmail.com","name":"Weiru"},"url":"https://api.github.com/repos/MMP-forTour/ForTour/commits/13e791d47fb781be5a5f3c175b6fbb2c0c31d9a4","message":"merge"},{"sha":"5f12198edb7dd1ab3b3df8ef033473e9bc07b34b","author":{"email":"247cfcf4924b6feed004ec5a2d822bb35b8f8aea@gmail.com","name":"Weiru"},"url":"https://api.github.com/repos/MMP-forTour/ForTour/commits/5f12198edb7dd1ab3b3df8ef033473e9bc07b34b","message":"Merge branch 'master' of github.com:MMP-forTour/ForTour\n\nConflicts:\n\tFinProj/AndroidManifest.xml\n\tFinProj/src/tw/edu/ntu/fortour/EditPage.java\n\tFinProj/src/tw/edu/ntu/fortour/OnePhoto.java"}],"head":"5f12198edb7dd1ab3b3df8ef033473e9bc07b34b","size":2}