Merge fail

This commit is contained in:
Victor Felder 2013-10-11 20:23:12 +02:00
parent f63b393c98
commit 477a22beff
1 changed files with 3 additions and 7 deletions

View File

@ -244,7 +244,8 @@
###Django
* [Djen of Django](http://agiliq.com/books/djenofdjango/)
* [Django by Example](http://www.lightbird.net/dbe/)
###Emacs
@ -330,7 +331,7 @@
* [Mozilla Developer Network's JavaScript Guide](https://developer.mozilla.org/en/JavaScript/Guide)
* [JavaScript Allongé](https://leanpub.com/javascript-allonge/read)
* [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)
@ -394,11 +395,6 @@
* [HGInit - Mercurial Tutorial by Joel Spolsky](http://hginit.com/)
###Nemerle
* See <strong>.NET</strong> below
###.NET (C# / VB / Nemerle / Visual Studio)
* [C# Essentials](http://www.techotopia.com/index.php/C_Sharp_Essentials)