Knockout.js fixed
This commit is contained in:
		| @@ -39,7 +39,7 @@ | ||||
|  | ||||
| ## Knockout.js | ||||
| * [Knockout.js Succinctly](http://www.syncfusion.com/resources/techportal/ebooks/knockoutjs) (PDF, Kindle) *(Just fill the fields with any values)* | ||||
| <<<<<<< HEAD | ||||
| * [Knockout.js Starter](http://dl.e-book-free.com/2013/07/knockoutjs_starter.pdf) | ||||
| * tech.pro: Knockout.js tutorial video series | ||||
|     * [Lesson 1 - Introduction](http://tech.pro/tutorial/1562/knockoutjs-lesson-1-introduction) | ||||
|     * [Lesson 2 - Initialising the application](http://tech.pro/tutorial/1563/knockoutjs-lesson-2-initialising-the-application) | ||||
| @@ -63,6 +63,3 @@ | ||||
| * [Mixu's Node Book](http://book.mixu.net/node/) | ||||
| * [The Node Beginner Book](http://nodebeginner.org/) | ||||
| * [Up and Running with Node](http://ofps.oreilly.com/titles/9781449398583/) | ||||
| ======= | ||||
| * [Knockout.js Starter](http://dl.e-book-free.com/2013/07/knockoutjs_starter.pdf) | ||||
| >>>>>>> fab749f124c297bdde81e5bb4070ed39ccac3bc3 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user