Default git diff algo=patience
Merge branch 'master' of https://github.com/paulkiernan/dotfiles
Resolve merge conflits

Conflicts:
	.gitconfig