GitHub PushEvent at 2014-04-08 01:20:46
Repository: pirate-treasure2
Actor: sunlovesystems
Payload: {"shas":[["87c6688a84fb55cdd060913167d9c8363e7a2d29","abc15296c35816555f34cbf9c569cdce5e43b8fb@yahoo.com","Fixed problem","Stephanie Losi",true],["47e2743b3e3e3f1dc9c1f8f42115059baf492f97","abc15296c35816555f34cbf9c569cdce5e43b8fb@yahoo.com","Merge branch 'master' of https://github.com/sunlovesystems/pirate-treasure2\ngit commit -m \"Fix conflict\"\"\nConflicts:\n\tPirate Adventure/CCViewController.m","Stephanie Losi",true]],"size":2,"ref":"refs/heads/master","head":"47e2743b3e3e3f1dc9c1f8f42115059baf492f97"}