Cleaned up cruft from merge

tmux/.tmux.conf

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