diff --git a/en/README.md.orig b/en/README.md.orig deleted file mode 100644 index b9720496..00000000 --- a/en/README.md.orig +++ /dev/null @@ -1,55 +0,0 @@ -<<<<<<< HEAD -<<<<<<< 2b65ffe75a66a23ea074aa13de82d219774d01bf -# Go Web 编程 -Go web编程是因为我喜欢Web编程,所以写了这本书,希望大家喜欢 -======= -======= ->>>>>>> eead24cf064976b648de5826eab51880c803b0fa -***Build Web Application with Golang*** -====================================== - -### Purpose - -Because I'm interested in web application development, I used my free time to write this book as an open source version. It doesn't mean that I have a very good ability to build web applications; I would like to share what I've done with Go in building web applications. - -- For those of you who are working with PHP/Python/Ruby, you will learn how to build a web application with Go. -- For those of you who are working with C/C++, you will know how the web works. - -I believe the purpose of studying is sharing with others. The happiest thing in my life is sharing everything I've known with more people. - -# Donate - -AliPay: alipay - -English Donate:[donate](http://beego.me/donate) - -## Community -QQ群:386056972 - -BBS:[http://golanghome.com/](http://golanghome.com/) - -### Acknowledgments - - - [四月份平民 April Citizen](https://plus.google.com/110445767383269817959) (review code) - - [洪瑞琦 Hong Ruiqi](https://github.com/hongruiqi) (review code) - - [边 疆 BianJiang](https://github.com/border) (write the configurations about Vim and Emacs for Go development) - - [欧林猫 Oling Cat](https://github.com/OlingCat)(review code) - - [吴文磊 Wenlei Wu](mailto:spadesacn@gmail.com)(provide some pictures) - - [北极星 Polaris](https://github.com/polaris1119)(review whole book) - - [雨 痕 Rain Trail](https://github.com/qyuhen)(review chapter 2 and 3) - -### License - -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](), unless otherwise specified. -<<<<<<< HEAD -<<<<<<< de3c5bdaa45425ed37306a45067d55eba7dcedc2 - -### Get Started - -[Index](./eBook/preface.md) ->>>>>>> add english version -======= ->>>>>>> update the readme -======= ->>>>>>> eead24cf064976b648de5826eab51880c803b0fa