GitHub PushEvent at 2014-04-01 03:15:26
Repository: TeamJavatar
Actor: dong-brian
Payload: {"shas":[["743f1d1766e8ac6ec0e75305c5194beccfcdf2a5","bdd33754e0a5a21b2bf2e33313909135dd25e8a6@gatech.edu","instructions","Brian Dong",true],["990e1343e68d24ba5f01cb927b277b0cbfef8060","bdd33754e0a5a21b2bf2e33313909135dd25e8a6@gatech.edu","Merge branch 'development' of https://github.com/sunheng/TeamJavatar.git\ninto development\n\nConflicts:\n\tbin/classes/com/example/teamjavatar/R$id.class\n\tbin/classes/com/example/teamjavatar/R$string.class\n\tbin/classes/com/example/teamjavatar/R$style.class\n\tgen/com/example/teamjavatar/R.java\n\tres/layout/activity_account_history.xml\n\tres/layout/activity_user_index.xml\n\tsrc/com/example/teamjavatar/application/AccountHistoryActivity.java\n\tsrc/com/example/teamjavatar/application/UserIndexActivity.java","Brian Dong",true]],"size":2,"ref":"refs/heads/development","head":"990e1343e68d24ba5f01cb927b277b0cbfef8060"}