From 35c94fff5d0fac24a9ceefbe76ae45f4fdb53f04 Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Sun, 9 Oct 2016 09:38:39 +0800
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 39e807e8..5fef5598 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # Multiple Language Versions
-<<<<<<< HEAD
-=======
+
 * [English](en/)
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa
 * [French](fr/)
 * [Spanish](es/)
 * [中文](zh/)
@@ -33,11 +31,6 @@ BBS：[http://golanghome.com/](http://golanghome.com/)
  - [polaris](https://github.com/polaris1119)(review书)
  - [雨痕](https://github.com/qyuhen)(review第二章)
 
-<<<<<<< HEAD
-=======
-Translator:
- - [LarryBattle](https://github.com/LarryBattle)
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa
 ## License
 Book License: [CC BY-SA 3.0 License](http://creativecommons.org/licenses/by-sa/3.0/)