Skip to content
This repository was archived by the owner on Mar 10, 2020. It is now read-only.

Commit 7f39df2

Browse files
author
Alan Shaw
committed
fix: oops bad merge
1 parent 45c7354 commit 7f39df2

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

package.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,8 @@
4545
"dirty-chai": "^2.0.1",
4646
"hat": "0.0.3",
4747
"ipfs-block": "~0.8.0",
48-
<<<<<<< HEAD
4948
"ipfs-unixfs": "^0.3.0",
50-
"ipfs-utils": "^0.4.2",
51-
=======
52-
"ipfs-unixfs": "~0.1.16",
53-
"ipfs-utils": "^0.5.0",
54-
>>>>>>> refactor: async iterables
49+
"ipfs-utils": "^0.6.0",
5550
"ipld-dag-cbor": "~0.15.0",
5651
"ipld-dag-pb": "^0.18.1",
5752
"is-ipfs": "~0.6.1",

0 commit comments

Comments
 (0)