From 26b672d22f535e41e882bd1f1483edad00afce79 Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 17 Jun 2014 19:33:55 +0200 Subject: Cleaning up merge mess --- .vundles.local | 4 ---- 1 file changed, 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 -- cgit v1.2.3-70-g09d2