From 93fec3e4b41ad0163b05319a7a7f4a6c2b1b88ae Mon Sep 17 00:00:00 2001
From: Vahagn Khachatryan <vahagn.khachatryan@gmail.com>
Date: Sun, 1 Mar 2020 22:41:38 +0000
Subject: [PATCH] vimrc conflicts resolved. Vundle updated.

---
 vim/vimrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index e9b2904..e19623f 100755
--- 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.