add conflict marker plugin

2026-03-03 22:47:29 +01:00 · 2016-07-25 22:39:51 +02:00
parent 9cf97c6354
commit 33ef0957ef
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@@ -33,6 +33,7 @@ Plug 'scrooloose/syntastic'
 Plug 'pmsorhaindo/syntastic-local-eslint.vim'

 Plug 'tpope/vim-fugitive'
+Plug 'rhysd/conflict-marker.vim'
 Plug 'airblade/vim-gitgutter'
 Plug 'inside/vim-search-pulse'