Merge branch 'master' of https://github.com/uvaes/dotfiles

zshrc conflict

1 files changed, 2 insertions, 1 deletions

diff --git a/vim/vimrc b/vim/vimrc
index 1179bd9..8e23b6e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -18,6 +18,7 @@ Plugin 'Tabular'
 Plugin 'tComment'
 Plugin 'Gundo'
 Plugin 'altercation/vim-colors-solarized'
+Plugin 'klen/python-mode'
 Plugin 'honza/vim-snippets'
 
 filetype plugin indent on
@@ -251,6 +252,6 @@ endfunction
 ""  Autocommands  
 augroup autorelead_vimrc
     au! 
-    au BufWritePost ~/.vimrc source ~/.vimrc
+    au BufWritePost ~/.vim/vimrc source ~/.vim/vimrc
 augroup END