Merge remote-tracking branch 'cadusk/master'

Conflicts:
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	tools/install.sh
This commit is contained in:
Gaetan Semet 2014-03-24 11:56:16 +01:00
commit 92ed38cb85
4 changed files with 13 additions and 14 deletions

View file

@ -70,10 +70,5 @@ if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
[ "$TERM" = "xterm" ] && TERM="xterm-256color"
# Aliases
alias ta='tmux attach -t'
alias tl='tmux list-session'
alias ts='tmux new-session'
source $ZSH/oh-my-zsh.sh
unsetopt correctall