GitHub PushEvent at 2014-10-31 11:58:13
Repository: PSAWebPortal
Actor: oonwuzu
Payload: {"shas":[["42ad638685ddea2786645e8c7ccc2b76ed5c0672","2f26e4b853e161a8e9dcba024c61e676d99273e3@swifta.com","I didn't add these files....but had to commit to resolve a conflict\nException","oonwuzu",true],["fda49240086f895655e3f0195bb359632e8650b1","2f26e4b853e161a8e9dcba024c61e676d99273e3@swifta.com","Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git\ninto development\n\nConflicts:\n\t.settings/com.vaadin.integration.eclipse.prefs","oonwuzu",true],["54d013aa33db5c68747fcd959b84d30934ab02cf","2f26e4b853e161a8e9dcba024c61e676d99273e3@swifta.com","Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git\ninto development\n\nConflicts:\n\t.settings/com.vaadin.integration.eclipse.prefs","oonwuzu",true],["a1526ca8cc9c41add351653b52b8c8191e7b80a5","2f26e4b853e161a8e9dcba024c61e676d99273e3@swifta.com","Merge branch 'development' of https://github.com/Swifta/PSAWebPortal.git\ninto development","oonwuzu",true]],"size":4,"ref":"refs/heads/development","head":"a1526ca8cc9c41add351653b52b8c8191e7b80a5"}