Merge commit 'HEAD@{1}' into develop

2014-11-30 03:23:18 +03:00 · 2014-11-30 03:23:18 +03:00 · 4624a1dc86
parent bf8f4a1496 a9aef12c34
commit 4624a1dc86
2 changed files with 0 additions and 6 deletions
--- a/tests/test_shells/input.tmux
+++ b/tests/test_shells/input.tmux
@ -1,4 +0,0 @@
-echo $TMUX
-exit
-kill-server
-
--- a/tests/test_shells/tmux.conf
+++ b/tests/test_shells/tmux.conf
@ -1,2 +0,0 @@
-source powerline/bindings/tmux/powerline.conf
-set -g default-shell tests/shell/path/dash