fix: merge conflict

libp2p · Apr 23, 2019 · 6540d09 · 6540d09
2 parents ec178c7 + 3f131d4
commit 6540d09
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,10 @@
   "dependencies": {
     "async": "^2.6.2",
     "bs58": "^4.0.1",
+<<<<<<< HEAD
     "crypto-key-composer": "~0.1.0",
+=======
+>>>>>>> 3f131d4a0a3b4ea8357144c2d73cc69508e306c0
     "multihashing-async": "~0.6.0",
     "nodeify": "^1.0.1",
     "safe-buffer": "^5.1.2",