Better way to add note without causing error on old versions

tmux-plugins · May 15, 2023 · b744af1 · b744af1
1 parent bbce97d
commit b744af1
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/resurrect.tmux b/resurrect.tmux
@@ -9,15 +9,29 @@ set_save_bindings() {
 	local key_bindings=$(get_tmux_option "$save_option" "$default_save_key")
 	local key
 	for key in $key_bindings; do
+<<<<<<< Updated upstream
 		tmux bind-key -N "Save session" "$key" run-shell "$CURRENT_DIR/scripts/save.sh"
+||||||| Stash base
+		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/save.sh"
+=======
+		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/save.sh"
+		tmux bind-key -N "Save session" "$key"
+>>>>>>> Stashed changes
 	done
 }
 
 set_restore_bindings() {
 	local key_bindings=$(get_tmux_option "$restore_option" "$default_restore_key")
 	local key
 	for key in $key_bindings; do
+<<<<<<< Updated upstream
 		tmux bind-key -N "Restore session" "$key" run-shell "$CURRENT_DIR/scripts/restore.sh"
+||||||| Stash base
+		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/restore.sh"
+=======
+		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/restore.sh"
+		tmux bind-key -N "Restore session" "$key"
+>>>>>>> Stashed changes
 	done
 }