Merge branch 'home' into 'fixthatshit'

# Conflicts:
#   powerline-shell-init
#   zshrc
This commit is contained in:
Howland Owl 2016-12-09 21:06:18 +02:00
commit 1639a576f4
10 changed files with 90 additions and 147 deletions

View file

@ -13,4 +13,4 @@ function install_powerline_precmd() {
if [ "$TERM" != "linux" ]; then
install_powerline_precmd
fi
fi