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

@ -10,7 +10,6 @@ if [ -d "$ZSH" ]; then
fi
echo "\033[0;34mCloning Oh My Zsh...\033[0m"
hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
echo "git not installed"
exit
}