{"push_id":1040305867,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"d3bab44f39c03dd4576d0654dc8364ef2ca01222","before":"a43a4579896ba5e496915c048f1a1b316542aa69","commits":[{"sha":"8ba0bbee86ba0835d22abd0b60bc119d250f60ec","author":{"email":"48d2c8a1825fbdf876a8b99ce1c1450ebf4110ad@Mataking.home","name":"Mata"},"message":"","distinct":true,"url":"https://api.github.com/repos/Mataking/NekoAtsume/commits/8ba0bbee86ba0835d22abd0b60bc119d250f60ec"},{"sha":"d3bab44f39c03dd4576d0654dc8364ef2ca01222","author":{"email":"48d2c8a1825fbdf876a8b99ce1c1450ebf4110ad@Mataking.home","name":"Mata"},"message":"Merge origin/master\n\nConflicts:\n\tsrc/main/java/com/sprsec/controller/LinkNavigation.java\n\tsrc/main/java/com/sprsec/dao/UserDAOImpl.java\n\tsrc/main/java/com/sprsec/model/User.java\n\tsrc/main/webapp/WEB-INF/pages/edituser.jsp\n\tsrc/main/webapp/WEB-INF/pages/login-form.jsp\n\tsrc/main/webapp/WEB-INF/pages/registration.jsp\n\tsrc/main/webapp/resource/style/style.css","distinct":true,"url":"https://api.github.com/repos/Mataking/NekoAtsume/commits/d3bab44f39c03dd4576d0654dc8364ef2ca01222"}]}