From d71ae981d4eb78affb3d39d9cbdb4fe07416bc44 Mon Sep 17 00:00:00 2001
From: jomido <jon@nhdc>
Date: Sun, 22 Jul 2018 14:28:20 -0500
Subject: [PATCH] Fixed tmux mouse and xresources merge conflict

---
 tmux/.tmux.conf | 9 ++++-----
 x/.Xresources   | 4 ----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 08da304..ab8ef91 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -33,11 +33,11 @@ set -g mode-keys vi
 
 # enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
 # copy/paste: shift+left click to highlight, then shift+middle to past
-if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
-    'set -g mouse on' \
-    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
+#if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
+#    'set -g mouse on' \
+#    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
 
-#set -g mouse on
+set -g mouse on
 #'set -g mouse on; set -g mouse-utf8 on' \
 
 bind-key Tab last-window
@@ -99,4 +99,3 @@ bind -T off F12 \
     set -u status-right \;\
     set -u status-bg \;\
     display-message "EXIT inner tmux ..."
->>>>>>> 4009da94841e784ad85e3e9fde7f6146d8627c23
diff --git a/x/.Xresources b/x/.Xresources
index ee3b611..13e9429 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,10 +1,6 @@
 URxvt*scrollBar:	false
 URxvt.font:     xft:Terminus:size=14:antialias=true
-<<<<<<< HEAD
-URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
-=======
 !URxvt.boldFont: xft:Terminus:bold:size=14:antialias=true
->>>>>>> 4009da94841e784ad85e3e9fde7f6146d8627c23
 URxvt*transparent: true
 URxvt*shading: 10