chore: update deps

ipfs · Aug 27, 2017 · 9a08912 · 9a08912
1 parent 219e2f6
commit 9a08912
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+package-lock.json
+yarn.lock
+
 # Logs
 logs
 *.log
@@ -31,7 +34,6 @@ node_modules
 
 # Optional REPL history
 .node_repl_history
-<<<<<<< 05e1a1c74aa0e36274406f708d6aef0bb5ebb1d6
 
 # Dignified.js builds
 dist

diff --git a/package.json b/package.json
@@ -29,22 +29,22 @@
     "async": "^2.5.0",
     "bl": "^1.2.1",
     "bs58": "^4.0.1",
-    "chai": "^4.1.0",
+    "chai": "^4.1.1",
     "cids": "^0.5.1",
     "concat-stream": "^1.6.0",
     "detect-node": "^2.0.3",
     "ipfs-block": "^0.6.0",
     "ipld-dag-cbor": "^0.11.1",
     "ipld-dag-pb": "^0.11.0",
     "multiaddr": "^2.3.0",
-    "multihashes": "^0.4.5",
+    "multihashes": "^0.4.8",
     "multihashing-async": "^0.4.6",
     "peer-id": "^0.9.0",
     "pull-stream": "^3.6.0",
     "safe-buffer": "^5.1.1"
   },
   "devDependencies": {
-    "aegir": "^11.0.2",
+    "aegir": "^12.0.0",
     "dirty-chai": "^2.0.1"
   },
   "contributors": [