Merge branch 'master' into work

This commit is contained in:
David Tomaschik
2016-02-15 08:53:08 -08:00
2 changed files with 0 additions and 4 deletions

View File

@@ -40,5 +40,3 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
fi fi
if [[ -e $HOME/.aliases ]] ; then source $HOME/.aliases ; fi if [[ -e $HOME/.aliases ]] ; then source $HOME/.aliases ; fi
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting

View File

@@ -54,5 +54,3 @@ fi
# Load any local settings # Load any local settings
if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting