File tree Expand file tree Collapse file tree 1 file changed +14
-0
lines changed Expand file tree Collapse file tree 1 file changed +14
-0
lines changed Original file line number Diff line number Diff line change @@ -9,15 +9,29 @@ set_save_bindings() {
9
9
local key_bindings=$( get_tmux_option " $save_option " " $default_save_key " )
10
10
local key
11
11
for key in $key_bindings ; do
12
+ <<< <<< < Updated upstream
12
13
tmux bind-key -N " Save session" " $key " run-shell " $CURRENT_DIR /scripts/save.sh"
14
+ ||||||| Stash base
15
+ tmux bind-key " $key " run-shell " $CURRENT_DIR /scripts/save.sh"
16
+ =======
17
+ tmux bind-key " $key " run-shell " $CURRENT_DIR /scripts/save.sh"
18
+ tmux bind-key -N " Save session" " $key "
19
+ >>>>>>> Stashed changes
13
20
done
14
21
}
15
22
16
23
set_restore_bindings () {
17
24
local key_bindings=$( get_tmux_option " $restore_option " " $default_restore_key " )
18
25
local key
19
26
for key in $key_bindings ; do
27
+ <<< <<< < Updated upstream
20
28
tmux bind-key -N " Restore session" " $key " run-shell " $CURRENT_DIR /scripts/restore.sh"
29
+ ||||||| Stash base
30
+ tmux bind-key " $key " run-shell " $CURRENT_DIR /scripts/restore.sh"
31
+ =======
32
+ tmux bind-key " $key " run-shell " $CURRENT_DIR /scripts/restore.sh"
33
+ tmux bind-key -N " Restore session" " $key "
34
+ >>>>>>> Stashed changes
21
35
done
22
36
}
23
37
You can’t perform that action at this time.
0 commit comments