Merge pull request astaxie#738 from mylxsw/master

Update ref.md

Author: astaxie

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)