Permalink
Browse files

fixed merge conflicts for optionalDependency on weak

  • Loading branch information...
1 parent 52bfa75 commit 8ebee2aa8c70bfef3ad0ba441cdfae9a227d9e6e @substack committed Jan 2, 2014
Showing with 4 additions and 2 deletions.
  1. +4 −2 package.json
View
@@ -13,8 +13,10 @@
},
"dependencies" : {
"dnode-protocol" : "~0.2.2",
- "jsonify" : "~0.0.0",
- "weak" : "~0.3.0"
+ "jsonify" : "~0.0.0"
+ },
+ "optionalDependencies": {
+ "weak": "~0.3.0"
},
"devDependencies" : {
"tape" : "~2.3.2"

0 comments on commit 8ebee2a

Please sign in to comment.