GitHub PushEvent at 2014-06-21 16:45:20
Repository: merge-conflicts
Actor: smashwilson
Payload: {"shas":[["3bbc85d6b1113e3fc7ec0f23d01c5bce2f3afd53","8d458f55d3052bb46018ce3f1d443514622c0f93@gmail.com","Highlight the cursor line within conflict sides.","Ash Wilson",false],["f4801478aeedfa3a68405ebee226b5dde46675bb","8d458f55d3052bb46018ce3f1d443514622c0f93@gmail.com","Merge pull request #66 from smashwilson/highlight-current-line\n\nHighlight the cursor line within conflict sides.","Ash Wilson",true]],"size":2,"ref":"refs/heads/master","head":"f4801478aeedfa3a68405ebee226b5dde46675bb"}