remove conflict-marker, unimpared is again enough

This commit is contained in:
Thomas Ruoff
2018-01-27 23:37:10 +01:00
parent 0b443c8514
commit 86cf85c183

1
vimrc
View File

@@ -32,7 +32,6 @@ Plug 'maralla/completor.vim', { 'do': 'make js'}
" git related
Plug 'tpope/vim-fugitive'
Plug 'tpope/vim-rhubarb'
Plug 'rhysd/conflict-marker.vim'
Plug 'airblade/vim-gitgutter'
" appearence