Merge branch 'master' of github.com:unphased/oh-my-zsh into mine-master

Conflicts:
	zshrc
This commit is contained in:
Steven Lu 2013-07-11 14:48:05 -04:00
commit 423eac2431

1
zshrc
View file

@ -6,6 +6,7 @@ ZSH=$HOME/.oh-my-zsh
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
ZSH_THEME="lust"
export LANG=en_US.UTF-8
# Example aliases
# alias zshconfig="mate ~/.zshrc"