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

---
 en/README.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/en/README.md b/en/README.md
index b9720496..45cd0c02 100644
--- a/en/README.md
+++ b/en/README.md
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< 2b65ffe75a66a23ea074aa13de82d219774d01bf
-# Go Web 编程
-Go web编程是因为我喜欢Web编程,所以写了这本书,希望大家喜欢
-=======
-=======
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa
 ***Build Web Application with Golang***
 ======================================
 
@@ -42,14 +35,7 @@ BBS：[http://golanghome.com/](http://golanghome.com/)
 
 This book is licensed under the [CC BY-SA 3.0 License](http://creativecommons.org/licenses/by-sa/3.0/),
 the code is licensed under a [BSD 3-Clause License](<https://github.com/astaxie/build-web-application-with-golang/blob/master/LICENSE.md>), unless otherwise specified.
-<<<<<<< HEAD
-<<<<<<< de3c5bdaa45425ed37306a45067d55eba7dcedc2
 
 ### Get Started
 
 [Index](./eBook/preface.md)
->>>>>>> add english version
-=======
->>>>>>> update the readme
-=======
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa