Permalink
Browse files

Update dependency versions.

  • Loading branch information...
1 parent 1701850 commit 5a24d124a8d56d95baa62773033bc1b44594d0b4 @jasondavies jasondavies committed with Brian Staats Dec 28, 2011
Showing with 10 additions and 2 deletions.
  1. +8 −0 package.json
  2. +2 −2 src/package.js
View
@@ -19,8 +19,16 @@
"type": "git",
"url": "http://github.com/mbostock/d3.git"
},
+<<<<<<< HEAD
"directories": {
"lib": "lib"
+=======
+ "main": "d3.js",
+ "devDependencies": {
+ "uglify-js": "1.2.3",
+ "jsdom": "0.2.10",
+ "vows": "0.6.1"
+>>>>>>> Update dependency versions.
},
"bpm:build": {
"bpm_libs.js": {
View
@@ -11,9 +11,9 @@ require("util").puts(JSON.stringify({
"repository": {"type": "git", "url": "http://github.com/mbostock/d3.git"},
"main": "d3.js",
"devDependencies": {
- "uglify-js": "1.2",
+ "uglify-js": "1.2.3",
"jsdom": "0.2.10",
- "vows": "0.6.0"
+ "vows": "0.6.1"
},
"scripts": {"test": "./node_modules/vows/bin/vows"}
}, null, 2));

0 comments on commit 5a24d12

Please sign in to comment.