Merge remote-tracking branch 'sjl/master'

Conflicts:
	README.textile
	tools/install.sh
This commit is contained in:
Shawn Sorichetti 2011-05-12 09:27:49 -04:00
commit 2fc47e2097
2 changed files with 4 additions and 4 deletions

View file

@ -5,7 +5,7 @@ then
fi
echo "Cloning Oh My Zsh..."
/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
/usr/bin/env git clone git://github.com/sjl/oh-my-zsh.git ~/.oh-my-zsh
echo "Looking for an existing zsh config..."
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]