{"head":"2f07a08fe9563cb2cef1a743fd519c4e8f0a6ef3","size":1,"push_id":44021177,"shas":[["2f07a08fe9563cb2cef1a743fd519c4e8f0a6ef3","b3f285cb432b7c72c00fff52dbc2439de55f4b42@gmail.com","Merge branch 'master' of https://github.com/r00k/dotfiles\n\nConflicts:\n\tbash/aliases\n\tbash/config\n\tvimrc","John Wilde"]],"ref":"refs/heads/master"}