GitHub CreateEvent at 2014-11-04 18:32:31
Repository: Diffmerge-Example
Actor: laumarino
Payload: ref: conflict
ref_type: branch
master_branch: master
description: Creating merge conflict to show diffmerge capabilities. 
pusher_type: user