提交 477a22be 编写于 作者: V Victor Felder

Merge fail

上级 f63b393c
...@@ -244,7 +244,8 @@ ...@@ -244,7 +244,8 @@
###Django ###Django
* [Djen of Django](http://agiliq.com/books/djenofdjango/)
* [Django by Example](http://www.lightbird.net/dbe/)
###Emacs ###Emacs
...@@ -330,7 +331,7 @@ ...@@ -330,7 +331,7 @@
* [Mozilla Developer Network's JavaScript Guide](https://developer.mozilla.org/en/JavaScript/Guide) * [Mozilla Developer Network's JavaScript Guide](https://developer.mozilla.org/en/JavaScript/Guide)
* [JavaScript Allongé](https://leanpub.com/javascript-allonge/read) * [JavaScript Allongé](https://leanpub.com/javascript-allonge/read)
* [Learning JavaScript Design Patterns](http://addyosmani.com/resources/essentialjsdesignpatterns/book/) * [Learning JavaScript Design Patterns](http://addyosmani.com/resources/essentialjsdesignpatterns/book/)
* [O'Reilly Programming JavaScript Applications - Early Release](http://chimera.labs.oreilly.com/books/1234000000262/index.html)
###JavaScript (Node.js specific) ###JavaScript (Node.js specific)
...@@ -394,11 +395,6 @@ ...@@ -394,11 +395,6 @@
* [HGInit - Mercurial Tutorial by Joel Spolsky](http://hginit.com/) * [HGInit - Mercurial Tutorial by Joel Spolsky](http://hginit.com/)
###Nemerle
* See <strong>.NET</strong> below
###.NET (C# / VB / Nemerle / Visual Studio) ###.NET (C# / VB / Nemerle / Visual Studio)
* [C# Essentials](http://www.techotopia.com/index.php/C_Sharp_Essentials) * [C# Essentials](http://www.techotopia.com/index.php/C_Sharp_Essentials)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册