Permalink
Browse files

updated zshrc

  • Loading branch information...
1 parent 878e2ad commit e13e2d65af96d6ef09909c6ae3b3979ded4f7a05 pghosh committed Feb 13, 2013
Showing with 0 additions and 3 deletions.
  1. +0 −3 zshrc
View
3 zshrc
@@ -66,8 +66,6 @@ setopt EXTENDED_GLOB
[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function
NODE_PATH=/usr/local/lib/node_modules
NODE_PATH=/usr/local/lib/node_modules
-<<<<<<< HEAD
-=======
export PATH=/Users/pghosh/tools/apache-jmeter-2.7/bin:/usr/local/bin:/Users/pghosh/tools/play-2.0.4:$PATH
export SLI_HOME=/Users/pghosh/codebase/sli/sli
launchctl setenv PATH $PATH
@@ -118,4 +116,3 @@ ingest-zip() {
 done
}
export TOGGLE_TABLESCANS=true
->>>>>>> 788d389... updated vim and other stuff

0 comments on commit e13e2d6

Please sign in to comment.