Cleaned up cruft from merge

This commit is contained in:
jond
2017-12-13 15:21:42 -06:00
parent 50be979e63
commit 2bca7516f9

View File

@@ -31,11 +31,8 @@ set -g mode-keys vi
if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \ if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
'set -g mouse on' \ 'set -g mouse on' \
'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on'
<<<<<<< HEAD
# 'set -g mouse on; set -g mouse-utf8 on' \ # 'set -g mouse on; set -g mouse-utf8 on' \
=======
bind-key Tab last-window bind-key Tab last-window
bind-key BTab previous-window bind-key BTab previous-window
>>>>>>> 8ec84cb04cb2073f5741bc1073e53dfa4a088a50