wrong
Merge branch 'master' of https://github.com/machgo/dotfiles

Conflicts:
	tmux.conf