GitHub PushEvent at 2014-12-01 07:20:24
Repository: Pokeman-Parody-Adaptation
Actor: alanlau730
Payload: {"shas":[["0273b92d39987d0c22769360c21c3e70961324e7","bc94d87943dfeea2a9081e458b1aebb4ce321e1a@usc.edu","--didnt really change anything","Alan Lau",true],["ee3762bff9ce462009cf810f528b251ce29a1d02","bc94d87943dfeea2a9081e458b1aebb4ce321e1a@usc.edu","Merge branch 'master' of\ngit@github.com:lchrislee/Pokeman-Parody-Adaptation.git\n\nConflicts:\n\tsrc/Battle/Battle.java\n\n\t--dunno why so many changes","Alan Lau",true]],"size":2,"ref":"refs/heads/master","head":"ee3762bff9ce462009cf810f528b251ce29a1d02"}