From 0c15983dae5b6900f11d2f562b94d58fad4a94a2 Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Thu, 21 Nov 2024 19:45:14 -0500
Subject: [PATCH] fix: tmux config

---
 tmux/tmux.conf | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 2a168b1..8987dbd 100755
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -73,16 +73,10 @@ bind -n M-h previous-window
 bind -n M-L next-window
 bind C-l send-keys 'C-l'
 
-<<<<<<< HEAD
-bind f run-shell "tmux display-popup -E -w 80% -h 80% ${SCRIPTS}/tmux-sessionator"
-bind-key -r C run-shell -b "${SCRIPTS}/tmux-sessionator ~/.dotfiles"
-bind S run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch"
-=======
 bind f run-shell "tmux display-popup -E -w 80% -h 80% ~/.local/scripts/tmux-sessionator"
 bind-key -r C run-shell -b "~/.local/scripts/tmux-sessionator ~/.dotfiles"
 unbind s
 bind s run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch"
->>>>>>> 4771d35 (feat: Nvim config updates)
 
 # reload new changes
 bind-key r source-file ~/.config/tmux/tmux.conf\; \display-message "source-file done"