GitHub PushEvent at 2014-11-18 19:12:08
Repository: group_03_2sem
Actor: louisejer
Payload: {"shas":[["b45263310e5316702a6713808cac292896dd1204","c1083408e072d1a43647e4f158440359cb0e81c6@loui-pc","Merge origin/master\n\nConflicts:\n\tsrc/dataSource/Mapper.java","loui",true],["7edb8c49604a6d19a05bcc757581d55f3d9f6640","c1083408e072d1a43647e4f158440359cb0e81c6@loui-pc","Merge origin/master","loui",true]],"size":2,"ref":"refs/heads/master","head":"7edb8c49604a6d19a05bcc757581d55f3d9f6640"}