Skip to content

Commit

Permalink
Merge branch 'master' of github.com:aaronj1335/dotfiles
Browse files Browse the repository at this point in the history 
Conflicts:
	home_files/bashrc
  • Loading branch information
@aaronj1335
aaronj1335 committed Jul 25, 2013
2 parents fbfbd0b + 0d21445 commit cd54748
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions home_files/bashrc
View file
Expand Up @@ -43,13 +43,16 @@ BREW_PREFIX="`which brew &>/dev/null && brew --prefix`"
[ -d /usr/local/Cellar/ruby/2.0.0-p0/bin ] && \ [ -d /usr/local/Cellar/ruby/2.0.0-p0/bin ] && \
export PATH="$PATH:/usr/local/Cellar/ruby/2.0.0-p0/bin" export PATH="$PATH:/usr/local/Cellar/ruby/2.0.0-p0/bin"


<<<<<<< HEAD
# GAH! curse u pysetup # GAH! curse u pysetup
export PYTHONPATH="$PYTHONPATH:/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages" export PYTHONPATH="$PYTHONPATH:/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages"
# WORTHLESS python # WORTHLESS python
[ -d /usr/local/share/python ] && export PATH="$PATH:/usr/local/share/python" [ -d /usr/local/share/python ] && export PATH="$PATH:/usr/local/share/python"


[ -f ~/code/z/z.sh ] && . ~/code/z/z.sh [ -f ~/code/z/z.sh ] && . ~/code/z/z.sh


=======
>>>>>>> 0d2144588d9482b4676863df7942ff13d3f7e3e7


### the arbitrary and entirely personal aliases ### ### the arbitrary and entirely personal aliases ###
alias l='ls ' alias l='ls '
Expand Down

0 comments on commit cd54748

Please sign in to comment.