From 500dac03dd5334e0cee0a81b33f1b190940abc3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AE=A1=E5=AE=9C=E5=B0=A7?= Date: Sat, 19 Nov 2016 00:25:51 +0800 Subject: [PATCH] Update ref.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 冲突解决 --- zh/ref.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/zh/ref.md b/zh/ref.md index 0f26439c..7b8e48e2 100644 --- a/zh/ref.md +++ b/zh/ref.md @@ -11,14 +11,5 @@ 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) -<<<<<<< HEAD -<<<<<<< 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 -======= -10. [Network programming with Go](http://jan.newmarch.name/go) -11. [RESTFul](http://www.ruanyifeng.com/blog/2011/09/restful.html) ->>>>>>> eead24cf064976b648de5826eab51880c803b0fa +11. [RESTful](http://www.ruanyifeng.com/blog/2011/09/restful.html)