Adding rhysd/conflict-marker.vim

spf13 · spf13 · commit e96e1c101184 · 2015-11-12T09:00:08.000-05:00
diff --git a/.vimrc.bundles b/.vimrc.bundles
@@ -106,6 +106,7 @@
             Bundle 'spf13/vim-colors'
             Bundle 'tpope/vim-surround'
             Bundle 'tpope/vim-repeat'
+            Bundle 'rhysd/conflict-marker.vim'
             Bundle 'jiangmiao/auto-pairs'
             Bundle 'ctrlpvim/ctrlp.vim'
             Bundle 'tacahiroy/ctrlp-funky'
