From e96e1c1011846955f3e502eb8ae9c3987c62869e Mon Sep 17 00:00:00 2001
From: spf13 <steve.francia@gmail.com>
Date: Thu, 12 Nov 2015 09:00:08 -0500
Subject: [PATCH] Adding rhysd/conflict-marker.vim

---
 .vimrc.bundles | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vimrc.bundles b/.vimrc.bundles
index 9b9d75882..142a7cf2d 100644
--- 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'