vimrc conflicts resolved. Vundle updated.

2020-03-01 22:41:38 +00:00
parent 6833f5b5c9
commit 93fec3e4b4
1 changed files with 2 additions and 2 deletions
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -428,8 +428,7 @@ if filereadable(expand(s:vundle_path.'/README.md'))
    let g:airline#extensions#tabline#left_alt_sep = '|'
    let g:airline_powerline_fonts = 1

-    "
-    "
+
    "
    Plugin 'scrooloose/nerdtree'
    let g:NERDTreeQuitOnOpen = 1
@@ -488,6 +487,7 @@ if filereadable(expand(s:vundle_path.'/README.md'))
    "   Tmux integration.
    "
    Plugin 'benmills/vimux'
+
    "
    "   Extends modeline to variables.
    "   Needed by CF5 compile to read options right from file.