fix conflicts

revolunet · Jan 20, 2014 · 2bb2a00 · 2bb2a00
2 parents d50fc1f + 27beea2
commit 2bb2a00
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/img/recipes_with_angular.png b/img/recipes_with_angular.png
diff --git a/issues.json b/issues.json
@@ -376,6 +376,7 @@
         "url": "https://leanpub.com/javascript-allonge/read",
         "cover": "img/JavaScriptAllonge.jpg"
     }, {
+<<<<<<< HEAD
         "title": "jQuery Enlightenment",
         "author": "Cody Lindley",
         "authorUrl": "http://www.jqueryenlightenment.com",
@@ -399,7 +400,14 @@
         "info": "A Collection of Essential Basics.",
         "url": "https://leanpub.com/jsfun",
         "cover": "img/javascriptandnodefundamentals.png"
+    }, {
+        "title": "Recipes with Angular.js",
+        "author": "Frederik Dietz",
+        "authorUrl": "http://fdietz.de/",
+        "level": "Beginner",
+        "info": "Practical concepts and techniques for rapid web application development",
+        "url": "https://leanpub.com/recipes-with-angular-js/read",
+        "cover": "img/recipes_with_angular.png"
     }
 
-
 ]}