Permalink
Browse files

cleanup

  • Loading branch information...
1 parent 4c08216 commit c2fff47705be122a46f073159c942a27108eedcc @plukevdh committed Dec 4, 2012
Showing with 16 additions and 0 deletions.
  1. +16 −0 home/.zshrc
View
@@ -12,16 +12,25 @@ bindkey -e
COMPLETION_WAITING_DOTS=true
JRUBY_INVOCATION="$(readlink "$(which celerity_jruby)")"
+<<<<<<< Updated upstream
export JRUBY_OPTS="--1.9"
PATH="$HOME/.rbenv/bin:/usr/local/bin:/usr/local/sbin/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/share/npm/bin:$PATH"
+=======
+export JRUBY_OPTS=--1.9
+PATH="$HOME/.rbenv/bin:$HOME/bin:/usr/local/bin:/usr/local/sbin/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/share/npm/bin:$PATH"
+>>>>>>> Stashed changes
TZ="America/New_York"
HISTFILE=$HOME/.zhistory
HISTSIZE=1000
SAVEHIST=1000
HOSTNAME="`hostname`"
PAGER='less'
+<<<<<<< Updated upstream
alias edit=subl
+=======
+alias edit="subl"
+>>>>>>> Stashed changes
export EDITOR="subl -w"
# alias edit=vim
@@ -50,7 +59,14 @@ FLEX_HOME='~/Code/Flex/flex_sdk_3.4.1'
# zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
# zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
+<<<<<<< Updated upstream
fpath=(/usr/local/share/zsh-completions $fpath)
[[ -s "$HOME/.nvm/nvm.sh" ]] && . "$HOME/.nvm/nvm.sh"
eval "$(rbenv init -)"
+=======
+[[ -s "$HOME/.nvm/nvm.sh" ]] && . "$HOME/.nvm/nvm.sh" # This loads RVM into a shell session.
+
+eval "$(rbenv init -)"
+eval "$(hub alias -s)"
+>>>>>>> Stashed changes

0 comments on commit c2fff47

Please sign in to comment.