From a2cd900e176c37ba508d2726e08b4e0196e4e5f1 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Tue, 30 Jun 2020 15:10:25 +1000
Subject: [PATCH] FIXME fix rebase

---
 car.js       | 1 -
 package.json | 1 -
 2 files changed, 2 deletions(-)

diff --git a/car.js b/car.js
index 1c19cf3..50c817a 100644
--- 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
index 8350b52..dc0ee54 100644
--- 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",