lostecho/build-web-application-with-golang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ref.md

Browse Source 
冲突解决
This commit is contained in:
管宜尧
2016-11-19 00:25:51 +08:00
committed by GitHub
parent ce3d03c970
commit 500dac03dd
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zh/ref.md
View File

@@ -11,14 +11,5 @@
7. [Network programming with Go](http://jan.newmarch.name/go/) 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) 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) 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) 10. [Network programming with Go](http://jan.newmarch.name/go)
11. [RESTFul](http://www.ruanyifeng.com/blog/2011/09/restful.html) 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