{"push_id":835554075,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"f34483ce956a310976074b396be75b5dc65b192e","before":"c76992088231139fe2fefa94bc71ff5a0abe744c","commits":[{"sha":"3e2b83f502c10fc05ce474dac7f0091d436960c2","author":{"email":"c279dabc3b972f270683bc493e1e525220ea8752@students.unibe.ch","name":"Marc Jost"},"message":"Initial Local Commit","distinct":true,"url":"https://api.github.com/repos/unibe-ese/ese2015-team2/commits/3e2b83f502c10fc05ce474dac7f0091d436960c2"},{"sha":"f34483ce956a310976074b396be75b5dc65b192e","author":{"email":"c279dabc3b972f270683bc493e1e525220ea8752@students.unibe.ch","name":"Marc Jost"},"message":"- added account type\n- reordered fields on registration\n\n+ Merge origin/master\n\nConflicts:\n\tpom.xml\n\tsrc/main/java/ch/eset2/model/Customer.java\n\tsrc/main/java/ch/eset2/web/beans/Login.java\n\tsrc/main/webapp/WEB-INF/shiro.ini\n\tsrc/main/webapp/WEB-INF/web.xml\n\tsrc/main/webapp/layout/baseTemplate.xhtml\n\tsrc/main/webapp/login.xhtml\n\tsrc/main/webapp/regSuccess.xhtml\n\tsrc/main/webapp/registration.xhtml\n\tsrc/main/webapp/resources/ezcomp/loginComponent.xhtml\n\tsrc/main/webapp/test/test.xhtml","distinct":true,"url":"https://api.github.com/repos/unibe-ese/ese2015-team2/commits/f34483ce956a310976074b396be75b5dc65b192e"}]}