Merge branch 'master' of github.com:ryanc/dotfiles

Conflicts:
	.bash_profile
This commit is contained in:
Ryan Cavicchioni 2013-05-25 18:34:26 -05:00
commit 65eaa60309

View File

@ -60,7 +60,7 @@ PS1='\[\e[1;32m\][\u@\h \w] \$\[\e[0m\] '
export EDITOR=vim export EDITOR=vim
PATH=/usr/local/bin:$PATH PATH=$HOME/.rbenv/bin:/usr/local/bin:$PATH
# This loads RVM into a shell session. # This loads RVM into a shell session.
#[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" #[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"