FIXME fix rebase

ipld · Jun 30, 2020 · a2cd900 · a2cd900
1 parent b1668bc
commit a2cd900
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/car.js b/car.js
@@ -171,7 +171,6 @@ async function writeStream (multiformats, stream) {
   return new CarDatastore(multiformats, reader, writer)
 }
 
-<<<<<<< HEAD
 async function traverseBlock (block, get, car, concurrency = 1, seen = new Set()) {
   const cid = await block.cid()
   await car.put(cid, block.encodeUnsafe())

diff --git a/package.json b/package.json
@@ -36,7 +36,6 @@
     "bl": "^4.0.2",
     "cids": "^0.8.0",
     "garbage": "0.0.0",
-    "hundreds": "0.0.7",
     "hundreds": "0.0.2",
     "ipld-dag-pb": "^0.18.5",
     "jsdoc4readme": "^1.3.0",