Fix merge conflicts

consensusnetworks · Feb 22, 2023 · 042b22a · 042b22a
2 parents e6622fb + 0cf053d
commit 042b22a
Show file tree

Hide file tree

Showing 38 changed files with 3,098 additions and 3,924 deletions.
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -15,7 +15,6 @@
     "buffer": "^6.0.3",
     "d3": "^7.8.1",
     "ethers": "^5.7.2",
-    "iotex-antenna": "^0.31.6",
     "util": "^0.12.5",
     "vue": "^3.2.25",
     "vue-router": "^4.0.15",

diff --git a/apps/web/public/BTC.svg b/apps/web/public/BTC.svg