Skip to content
Browse files

fix conflicts

  • Loading branch information...
2 parents d50fc1f + 27beea2 commit 2bb2a00f63d578f32c4b31585681179b8daf4cbd @revolunet committed Jan 21, 2014
Showing with 9 additions and 1 deletion.
  1. BIN img/recipes_with_angular.png
  2. +9 −1 issues.json
View
BIN img/recipes_with_angular.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
10 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"
}
-
]}

0 comments on commit 2bb2a00

Please sign in to comment.
Something went wrong with that request. Please try again.