Resolving conflict with merge of #970

This commit is contained in:
Robby Russell 2013-04-23 20:44:35 -07:00
commit 81ed0c4115

View File

@ -2,7 +2,6 @@ if [[ "$DISABLE_CORRECTION" == "true" ]]; then
return
else
setopt correct_all
alias man='nocorrect man'
alias mv='nocorrect mv'
alias mysql='nocorrect mysql'
@ -11,4 +10,5 @@ else
alias heroku='nocorrect heroku'
alias ebuild='nocorrect ebuild'
alias hpodder='nocorrect hpodder'
alias sudo='nocorrect sudo'
fi