GitHub PushEvent at 2014-07-22 03:53:53
Repository: cmsc495calendar
Actor: erobertson4
Payload: {"shas":[["00c74c03e56e8742d4dbf9fe1f91c30173e48f9d","80e2012a780e4f9a069d31b57e6eff1efd14aeae@ameritech.net","Fixing another merge conflict\n\nConflicts:\nsrc/presenter/Main.java","erobertson4",true],["9cbd3647b4dce92c276adc991d769c0fbbf208b7","80e2012a780e4f9a069d31b57e6eff1efd14aeae@ameritech.net","Fixing merge\n\nfixing merge","erobertson4",true]],"size":2,"ref":"refs/heads/master","head":"9cbd3647b4dce92c276adc991d769c0fbbf208b7"}