GitHub PushEvent at 2014-10-21 16:24:49
Repository: warsofbaraxa
Actor: Ekmort
Payload: {"shas":[["56373dad98d3eae7eaaebc567ef7634d629122ae","cec6116ad1c1e50b1bf1e8da5f1e23ace0243292@hotmail.com","Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\twarsofbaraxa.v12.suo\n\twarsofbaraxa/Class1.cs\n\twarsofbaraxa/bin/Debug/warsofbaraxa.dll\n\twarsofbaraxa/bin/Debug/warsofbaraxa.pdb\n\n\twarsofbaraxa/obj/Debug/warsofbaraxa.csprojResolveAssemblyReference.cache\n\twarsofbaraxa/obj/Debug/warsofbaraxa.dll\n\twarsofbaraxa/obj/Debug/warsofbaraxa.pdb","Ekmort",true]],"size":1,"ref":"refs/heads/master","head":"56373dad98d3eae7eaaebc567ef7634d629122ae"}