fixed merge conflict
This commit is contained in:
commit
fecc31cf2c
5
.vimrc
5
.vimrc
|
|
@ -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()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue