GitHub PushEvent at 2014-04-25 15:30:36
Repository: Team_Assignment-RPG
Actor: jreale4
Payload: {"shas":[["546bd016499935d1424db381df46059e4b32e895","7ec38c5185334133c2205379abc3c50f58e00673@linkshideaway.com","Updated BattleView (maybe?)","Ryan Hammett",true],["e4a8b4e746b69ae822de4853c64687a75fb84280","7ec38c5185334133c2205379abc3c50f58e00673@linkshideaway.com","Stable commit before merge.","Ryan Hammett",true],["6a2f0f8cfe922623326cfa72023ee111dac4215d","7ec38c5185334133c2205379abc3c50f58e00673@linkshideaway.com","Merge remote-tracking branch 'jreale4/master'\n\nConflicts:\n\tRPG/src/com/jreale4/RPG/client/BattleView.java\n\tRPGControllers/src/com/jreale4/RPG/client/controllers/BattleController.java\n\tRPGControllers/src/com/jreale4/RPG/server/controllers/BattleController.java","Ryan Hammett",true],["b4ecd94b7e7ef1b86c051bc7290312c5c2f2f77d","7ec38c5185334133c2205379abc3c50f58e00673@linkshideaway.com","Updated BattleView.","Ryan Hammett",true],["230d15528da6345c662576848c3c3da7428408fc","7ec38c5185334133c2205379abc3c50f58e00673@linkshideaway.com","Added files to index.","Ryan Hammett",true],["313af1c87f2b59abb9cc97eb24a27cc192eff893","7ec38c5185334133c2205379abc3c50f58e00673@linkshideaway.com","Merge remote-tracking branch 'jreale4/master'\n\nConflicts:\n\tRPG/src/com/jreale4/RPG/client/AttackService.java","Ryan Hammett",true]],"size":6,"ref":"refs/heads/master","head":"313af1c87f2b59abb9cc97eb24a27cc192eff893"}