diff options
| -rw-r--r-- | .vundles.local | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.vundles.local b/.vundles.local index e0a0454..2d1b274 100644 --- a/.vundles.local +++ b/.vundles.local @@ -9,12 +9,8 @@ Bundle "sophacles/vim-processing" "latex Bundle "vim-scripts/LaTeX-Suite-aka-Vim-LaTeX" "octave -<<<<<<< HEAD Bundle "sjas/octave.vim" " netrw Bundle "vim-scripts/netrw.vim" " ctrlp Bundle "vim-scripts/ctrlp.vim" -======= -Bundle "sjas/octave.vim" ->>>>>>> 3b44361df3ede6208faa6fc97d584d33889dedf5 |