From 0487bd9566bf3e3a1e111193d200738de8d748d7 Mon Sep 17 00:00:00 2001
From: GrayLand <languilin1109@vip.qq.com>
Date: Fri, 1 Sep 2017 09:11:42 +0800
Subject: [PATCH] Resolve conflicts

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

diff --git a/README.md b/README.md
index f66ad1d..2fa1b74 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,6 @@
 <img src="https://i.imgur.com/bYwl7Vf.png" alt="Learn Regex">
 </p><br/>
 
-<<<<<<< HEAD
-
-[中文版](README-zh-simple.md)
-=======
 ## Translations:
 
 * [English](README.md)
@@ -15,12 +11,8 @@
 * [Português do Brasil](README-pt_BR.md)
 * [中文版](README-cn.md)
 * [日本語](README-ja.md)
-<<<<<<< HEAD
->>>>>>> zeeshanu/master
-=======
 * [한국어](README-ko.md)
 * [Turkish](README-tr.md)
->>>>>>> zeeshanu/master
 
 ## What is Regular Expression?