From e2de7abfccd37ba333556dbd4cce6559cb7a9328 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 11 Jan 2017 12:54:10 +0800
Subject: [PATCH] Fix Readme

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index ed29e5050..595b3a80e 100644
--- a/README.md
+++ b/README.md
@@ -512,8 +512,6 @@ Key   | Mode | Action
 - [Rafael Bodill](https://github.com/rafi) and his vim-config
 - [Bailey Ling](https://github.com/bling) and his dotvim
 
-<<<<<<< HEAD
-=======
 
 [dein.vim]: https://github.com/Shougo/dein.vim  
 [vimproc]: https://github.com/Shougo/vimproc.vim