GitHub PushEvent at 2014-09-27 18:26:01
Repository: TestRepo002
Actor: tmpTstB
Payload: {"shas":[["d06273ed6554d1b33c24ecbdbdefa2a8621bf94b","d09f77ee14bbde865392d2040212f649b25524b4@tsbmob.com","testing conflict 2 (Local)","Boris Tsigelman",true],["4fbd3941fafadafa9271708ecfc396d2ff8e5cb5","d09f77ee14bbde865392d2040212f649b25524b4@tsbmob.com","Merge branch 'master' of https://github.com/tmpTstB/TestRepo002\n\nConflicts:\n\ttestGit002/testGit002/AppDelegate.swift","Boris Tsigelman",true]],"size":2,"ref":"refs/heads/master","head":"4fbd3941fafadafa9271708ecfc396d2ff8e5cb5"}