From 86cf85c1835cf7f23502ecc1b9acc20591952af3 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Sat, 27 Jan 2018 23:37:10 +0100
Subject: [PATCH] remove conflict-marker, unimpared is again enough

---
 vimrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vimrc b/vimrc
index ffb0ecb..06b2a1c 100644
--- a/vimrc
+++ b/vimrc
@@ -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