Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

Conflicts:
	home_files/bashrc
  • Loading branch information...
commit cd54748020df416937292c658afb72b07b08c326 2 parents fbfbd0b + 0d21445
@aaronj1335 authored
Showing with 3 additions and 0 deletions.
  1. +3 −0  home_files/bashrc
View
3  home_files/bashrc
@@ -43,6 +43,7 @@ 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
@@ -50,6 +51,8 @@ export PYTHONPATH="$PYTHONPATH:/System/Library/Frameworks/Python.framework/Versi
[ -f ~/code/z/z.sh ] && . ~/code/z/z.sh
+=======
+>>>>>>> 0d2144588d9482b4676863df7942ff13d3f7e3e7
### the arbitrary and entirely personal aliases ###
alias l='ls '
Please sign in to comment.
Something went wrong with that request. Please try again.