Skip to content
Browse files

fix dum bug

  • Loading branch information...
1 parent cd54748 commit dd586b35c76cb6a883f31a2ff60941e15035d346 @aaronj1335 committed Jul 25, 2013
Showing with 0 additions and 6 deletions.
  1. +0 −6 home_files/bashrc
View
6 home_files/bashrc
@@ -43,17 +43,11 @@ BREW_PREFIX="`which brew &>/dev/null && brew --prefix`"
[ -d /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
-export PYTHONPATH="$PYTHONPATH:/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages"
# WORTHLESS python
[ -d /usr/local/share/python ] && export PATH="$PATH:/usr/local/share/python"
[ -f ~/code/z/z.sh ] && . ~/code/z/z.sh
-=======
->>>>>>> 0d2144588d9482b4676863df7942ff13d3f7e3e7
-
### the arbitrary and entirely personal aliases ###
alias l='ls '
alias ll='ls -l'

0 comments on commit dd586b3

Please sign in to comment.
Something went wrong with that request. Please try again.