diff options
Diffstat (limited to '.vundles.local')
| -rw-r--r-- | .vundles.local | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.vundles.local b/.vundles.local index b020552..e0a0454 100644 --- a/.vundles.local +++ b/.vundles.local @@ -9,4 +9,12 @@ Bundle "sophacles/vim-processing" "latex Bundle "vim-scripts/LaTeX-Suite-aka-Vim-LaTeX" "octave -Bundle "sjas/octave.vim"
\ No newline at end of file +<<<<<<< HEAD +Bundle "sjas/octave.vim" +" netrw +Bundle "vim-scripts/netrw.vim" +" ctrlp +Bundle "vim-scripts/ctrlp.vim" +======= +Bundle "sjas/octave.vim" +>>>>>>> 3b44361df3ede6208faa6fc97d584d33889dedf5 |