Resolved merge conflicts

This commit is contained in:
Marcel Kapfer 2017-10-15 19:20:33 +02:00
parent 3d48bf0601
commit 824dff91c6
2 changed files with 4 additions and 5 deletions

View file

@ -14,8 +14,6 @@ term rxvt-unicode-256color
termcapinfo xterm 'Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm'
defbce "on"
altscreen on
mousetrack on
screen -t fish 1 fish
screen -t fish 2 fish
@ -33,5 +31,7 @@ bind s split
defutf8 on
utf8 on
altscreen on
vbell off
shell "fish"