From 626c6c7fad6061a6f3b9cc3e47d2fc6c4301c835 Mon Sep 17 00:00:00 2001 From: Mojtahedi Date: Fri, 29 Nov 2013 21:54:56 +0330 Subject: [PATCH 1/2] knockout.js Starter --- javascript-frameworks-resources.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/javascript-frameworks-resources.md b/javascript-frameworks-resources.md index ee267447a..e04e77cfe 100644 --- a/javascript-frameworks-resources.md +++ b/javascript-frameworks-resources.md @@ -39,6 +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 * 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) @@ -62,3 +63,6 @@ * [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 From 4cdf6a4df7c359e4a1a192b2135b646515a5e922 Mon Sep 17 00:00:00 2001 From: Mojtahedi Date: Fri, 29 Nov 2013 21:58:44 +0330 Subject: [PATCH 2/2] Knockout.js fixed --- javascript-frameworks-resources.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/javascript-frameworks-resources.md b/javascript-frameworks-resources.md index e04e77cfe..5fe41ba40 100644 --- a/javascript-frameworks-resources.md +++ b/javascript-frameworks-resources.md @@ -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