fixed merge conflict

This commit is contained in:
Andrei Stoica 2019-01-29 13:38:17 -05:00
commit fecc31cf2c
1 changed files with 17 additions and 12 deletions

5
.vimrc
View File

@ -1,6 +1,11 @@
set nocompatible " be iMproved, required set nocompatible " be iMproved, required
filetype on " required filetype on " required
if empty(glob("~/.vim/bundle/Vundle.vim"))
execute '!git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim'
autocmd VimEnter * silent! PluginInstall
endif
" set the runtime path to include Vundle and initialize " set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin() call vundle#begin()