Fixed tmux mouse and xresources merge conflict

2018-07-22 14:28:20 -05:00
parent e9a1e917d4
commit d71ae981d4
2 changed files with 4 additions and 9 deletions
--- 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