Merge branch 'master' of git://github.com/alanpearce/dotfiles Conflicts: install
1 file changed, 2 insertions(+), 0 deletions(-)
changed files
M zsh/environment.zsh → zsh/environment.zsh
@@ -46,3 +46,5 @@ os=osx esac export os + +eval "$(direnv hook zsh)"