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

Conflicts: vim/vimrc
Funkmyster · Mar 6, 2013 · ab41263 · ab41263
2 parents b02011f + ab3eb94
commit ab41263
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/bash/bashrc b/bash/bashrc
@@ -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