Updated git config log format
Merge branch 'master' of github.com:randomutterings/dotfiles
Merge branch 'master' of github.com:randomutterings/dotfiles
Fixed merge conflict
Merge branch 'master' of github.com:randomutterings/dotfiles