Merge branch 'master' into 'develop'

# Conflicts: # files/tmux.conf.ssh
2020-10-25 20:32:05 +00:00
parent 3f8adf7f68 fecc4e73f1
commit d704966d82
2 changed files with 2 additions and 3 deletions
--- a/files/tmux.conf.local
+++ b/files/tmux.conf.local
@@ -294,7 +294,7 @@ bind C-a send-prefix
 # move status line to top
 #set -g status-position top

-bind '\' split-window -h
+bind \ split-window -h
 unbind '"'
 bind -n M-Left select-pane -L
 bind -n M-Right select-pane -R