diff options
| author | David Runge <david.runge@frqrec.com> | 2014-06-17 19:33:55 +0200 |
|---|---|---|
| committer | David Runge <david.runge@frqrec.com> | 2014-06-17 19:33:55 +0200 |
| commit | 26b672d22f535e41e882bd1f1483edad00afce79 (patch) | |
| tree | 080b1b7523c73c4ae0717735ee8d6d56b3816bf4 | |
| parent | cde6bd16bb48f0aecf98b656a9dcfef629e24d95 (diff) | |
| download | dotfiles-26b672d22f535e41e882bd1f1483edad00afce79.tar.gz dotfiles-26b672d22f535e41e882bd1f1483edad00afce79.tar.bz2 dotfiles-26b672d22f535e41e882bd1f1483edad00afce79.tar.xz dotfiles-26b672d22f535e41e882bd1f1483edad00afce79.zip | |
Cleaning up merge mess
| -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 |