From feda733afce50068b27be5987f5235ecae7298e1 Mon Sep 17 00:00:00 2001 From: James Miranda Date: Fri, 23 Sep 2016 18:03:39 -0300 Subject: [PATCH] Merging other languages --- en/ref.md | 3 ++- zh/ref.md | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/en/ref.md b/en/ref.md index 2328b8b2..65e7e6b3 100644 --- a/en/ref.md +++ b/en/ref.md @@ -10,4 +10,5 @@ This book is a summary of my Go experience, some content are from other gophers' 6. [Go Programming Language](http://golang.org/doc/) 7. [Network programming with Go](http://jan.newmarch.name/go/) 8. [setup-the-rails-application-for-internationalization](http://guides.rubyonrails.org/i18n.html#setup-the-rails-application-for-internationalization) -9. [The Cross-Site Scripting (XSS) FAQ](http://www.cgisecurity.com/xss-faq.html) \ No newline at end of file +9. [The Cross-Site Scripting (XSS) FAQ](http://www.cgisecurity.com/xss-faq.html) +10. [Network programming with Go](http://jan.newmarch.name/go) \ No newline at end of file diff --git a/zh/ref.md b/zh/ref.md index ac3ac8d3..0f71f5b2 100644 --- a/zh/ref.md +++ b/zh/ref.md @@ -11,5 +11,9 @@ 7. [Network programming with Go](http://jan.newmarch.name/go/) 8. [setup-the-rails-application-for-internationalization](http://guides.rubyonrails.org/i18n.html#setup-the-rails-application-for-internationalization) 9. [The Cross-Site Scripting (XSS) FAQ](http://www.cgisecurity.com/xss-faq.html) +<<<<<<< fa439f692f31fa3d054eac849ea958f29c613b6e 10. [Network programming with Go](http://jan.newmarch.name/go) 11. [RESTFul](http://www.ruanyifeng.com/blog/2011/09/restful.html) +======= +10. [Network programming with Go](http://jan.newmarch.name/go) +>>>>>>> fix #378