GitHub PushEvent at 2014-05-30 16:44:59
Repository: conflict
Actor: ganczar
Payload: {"shas":[["63cd399fd8bc3f0705a2ab235dc12c25f8fa3d4e","bfd0a5ec3420760b850b80b62559a6af5d178f90@ganczar.net","modified","Wojtek Ganczarski",true],["7bb18935e7d204a9fa2329f8ff20592fda867c1a","bfd0a5ec3420760b850b80b62559a6af5d178f90@ganczar.net","Merge branch 'master' into branch1\n\nConflicts:\n\tREADME.md","Wojtek Ganczarski",true]],"size":2,"ref":"refs/heads/master","head":"7bb18935e7d204a9fa2329f8ff20592fda867c1a"}