Permalink
Browse files

Merge branch 'master' of github.com:Funkmyster/Terminal

Conflicts:
	vim/vimrc
  • Loading branch information...
2 parents b02011f + ab3eb94 commit ab4126375428af04d3f26902a1ea6c9150cf36f5 Jacob Silva committed Mar 6, 2013
Showing with 0 additions and 1 deletion.
  1. +0 −1 bash/bashrc
View
@@ -185,7 +185,6 @@ export MYSQL_PS1="MySQL [$USER@$HOSTNAME] [\U] [\d] [\r:\m:\s \P] [\c]: "
PYTHONSTARTUP=~/.pythonrc.py
export PYTHONSTARTUP
export EDITOR="/usr/bin/vim --servername JSILVA-$PPID-$SCREENID --remote-tab-silent"
-export EDITOR="/usr/local/bin/vim --servername JSILVA-$PPID-$SCREENID --remote-tab-silent"
export WORKON_HOME=$HOME/.virtualenvs
export PROJECT_HOME=$HOME/Projects

0 comments on commit ab41263

Please sign in to comment.