GitHub PushEvent at 2014-04-17 01:34:39
Repository: IFDM491BravoTeam
Actor: tskeet
Payload: {"shas":[["883e2be255df360d36fdb412023cc0ef732bdcce","fd1aba717fa3c162b253948d868e33b8c7bf2219@gmail.com","various changes...","tskeet",true],["e816a5ed37e6cd6a52922756aada166d4ba9b7c3","fd1aba717fa3c162b253948d868e33b8c7bf2219@gmail.com","Merge branch 'master' of https://github.com/tskeet/IFDM491BravoTeam\n\nConflicts:\n\tTeamBravoProject/Library/CurrentLayout.dwlt\n\tTeamBravoProject/Library/CurrentMaximizeLayout.dwlt\n\tTeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n\tTeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n\tTeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp.dll\n\tTeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb","tskeet",true]],"size":2,"ref":"refs/heads/master","head":"e816a5ed37e6cd6a52922756aada166d4ba9b7c3"}