Fix error
This commit is contained in:
9
vimrc
9
vimrc
@ -32,11 +32,6 @@ endif
|
|||||||
Plugin 'tpope/vim-fugitive'
|
Plugin 'tpope/vim-fugitive'
|
||||||
" Color schemes
|
" Color schemes
|
||||||
Plugin 'morhetz/gruvbox'
|
Plugin 'morhetz/gruvbox'
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
" Code completion using <tab>
|
|
||||||
Plugin 'ervandew/supertab'
|
|
||||||
>>>>>>> c7499ab8bd1242702abaee5b9301a6b6e30886f8
|
|
||||||
|
|
||||||
call vundle#end()
|
call vundle#end()
|
||||||
filetype plugin indent on
|
filetype plugin indent on
|
||||||
@ -71,11 +66,7 @@ set list listchars=tab:▷⋅,trail:⋅,nbsp:⋅
|
|||||||
" set nowrap
|
" set nowrap
|
||||||
set hlsearch
|
set hlsearch
|
||||||
set incsearch
|
set incsearch
|
||||||
<<<<<<< HEAD
|
|
||||||
set foldlevel=2
|
set foldlevel=2
|
||||||
=======
|
|
||||||
set foldlevel=3
|
|
||||||
>>>>>>> c7499ab8bd1242702abaee5b9301a6b6e30886f8
|
|
||||||
set colorcolumn=80
|
set colorcolumn=80
|
||||||
|
|
||||||
" Behaviour
|
" Behaviour
|
||||||
|
Reference in New Issue
Block a user