modified:   .tmux.conf
	modified:   .tmux.conf2
Merge branch 'master' of https://github.com/utada/my-tmux.conf

Conflicts:
	.tmux.conf2

	modified:   .tmux.conf2