Merge branch 'master' of github.com:tlevine/nvm

Conflicts:
	nvm.sh
master
Thomas Levine 2012-10-10 19:06:34 -04:00
commit 903479aeca
1 changed files with 1 additions and 1 deletions

2
nvm.sh
View File

@ -12,7 +12,7 @@ fi
# Make zsh glob matching behave same as bash # Make zsh glob matching behave same as bash
# This fixes the "zsh: no matches found" errors # This fixes the "zsh: no matches found" errors
if [ ! -z "$(which unsetopt 2>/dev/null)" ]; then if [[ `which unsetopt 2>/dev/null` ]]; then
unsetopt nomatch 2>/dev/null unsetopt nomatch 2>/dev/null
fi fi