Skip to content

Commit b744af1

Browse files
committed
Better way to add note without causing error on old versions
1 parent bbce97d commit b744af1

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

resurrect.tmux

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,29 @@ set_save_bindings() {
99
local key_bindings=$(get_tmux_option "$save_option" "$default_save_key")
1010
local key
1111
for key in $key_bindings; do
12+
<<<<<<< Updated upstream
1213
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
1320
done
1421
}
1522

1623
set_restore_bindings() {
1724
local key_bindings=$(get_tmux_option "$restore_option" "$default_restore_key")
1825
local key
1926
for key in $key_bindings; do
27+
<<<<<<< Updated upstream
2028
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
2135
done
2236
}
2337

0 commit comments

Comments
 (0)