fix: clean up rebase

ipfs · Jul 19, 2019 · 54ec118 · 54ec118
1 parent da00a58
commit 54ec118
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -126,17 +126,10 @@
     "libp2p": "~0.25.4",
     "libp2p-bootstrap": "~0.9.3",
     "libp2p-crypto": "~0.16.0",
-<<<<<<< HEAD
     "libp2p-delegated-content-routing": "^0.2.3",
     "libp2p-delegated-peer-routing": "^0.2.3",
     "libp2p-kad-dht": "~0.15.2",
     "libp2p-keychain": "~0.4.2",
-=======
-    "libp2p-delegated-content-routing": "^0.2.2",
-    "libp2p-delegated-peer-routing": "^0.2.2",
-    "libp2p-kad-dht": "~0.15.1",
-    "libp2p-keychain": "~0.4.1",
->>>>>>> fix: apply review comments
     "libp2p-mdns": "~0.12.0",
     "libp2p-record": "~0.6.3",
     "libp2p-secio": "~0.11.0",