diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2014-11-05 17:42:50 +0000 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2014-11-05 17:42:50 +0000 |
| commit | 0af4d5a574db5b66c4997d342ab35ebd16aee86e (patch) | |
| tree | fb2ab4f8804d94052275119a933f4337dcecd25a /vim/vimrc | |
| parent | b96ef221ac6491697bec471669c36722dfecbde7 (diff) | |
| parent | 48340f31f1c8e514fdada7359b8e417455b71d59 (diff) | |
Merge branch 'master' of https://github.com/uvaes/dotfiles
zshrc conflict
Diffstat (limited to 'vim/vimrc')
| -rw-r--r-- | vim/vimrc | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |