fix: code review

ipfs · Apr 5, 2019 · edebc11 · edebc11
1 parent dfc057d
commit edebc11
Show file tree

Hide file tree

Showing 3 changed files with 241 additions and 69 deletions.
diff --git a/package.json b/package.json
@@ -41,13 +41,8 @@
     "bs58": "^4.0.1",
     "buffer-loader": "~0.1.0",
     "chai": "^4.2.0",
-<<<<<<< HEAD
-    "chai-bytes": "^0.1.1",
-    "cids": "~0.5.7",
-=======
     "chai-bytes": "~0.1.1",
-    "cids": "~0.5.5",
->>>>>>> chore: refactored interop tests
+    "cids": "~0.5.7",
     "cross-env": "^5.2.0",
     "detect-node": "^2.0.4",
     "dir-compare": "^1.7.1",
@@ -57,7 +52,7 @@
     "form-data": "^2.3.3",
     "go-ipfs-dep": "~0.4.18",
     "hat": "0.0.3",
-    "ipfs": "~0.34.4",
+    "ipfs": "ipfs/js-ipfs#master",
     "ipfs-http-client": "^29.1.0",
     "ipfs-unixfs": "~0.1.16",
     "ipfs-repo": "~0.26.1",