Browse files

Merge branch 'proclaim' of git://github.com/rowanmanning/microjs.com

Conflicts:
	data.js
  • Loading branch information...
2 parents 54ae66e + 9eb5f90 commit d9eb63b61308c860ddf973b70293ddff40a9b621 @rvagg rvagg committed Mar 12, 2013
Showing with 7 additions and 2 deletions.
  1. +7 −2 data.js
View
9 data.js
@@ -2198,8 +2198,6 @@ var MicroJS = [
source: "https://raw.github.com/Calamari/BehaviorTree.js/master/btree-complete.js"
},
{
-<<<<<<< HEAD
-<<<<<<< HEAD
name: "PinkySwear.js",
tags: ["promises"],
description: "A tiny implementation of the Promises/A+ specification.",
@@ -2254,5 +2252,12 @@ var MicroJS = [
description: "printf, sprintf, and vsprintf for JavaScript. Works in Node and browsers.",
url: "https://github.com/samsonjs/format",
source: "https://raw.github.com/samsonjs/format/master/format.js"
+ },
+ {
+ name: "Proclaim",
+ tags: ["assert", "test"],
+ description: "A simple assertion library for server and client side JavaScript.",
+ url: "https://github.com/rowanmanning/proclaim",
+ source: "https://raw.github.com/rowanmanning/proclaim/master/lib/proclaim.js"
}
];

0 comments on commit d9eb63b

Please sign in to comment.