fix: merge conflicts

2023-06-12 17:11:10 +08:00
parent 517a5413b0 b03bbfd860
commit b7224b5387
12 changed files with 222 additions and 24 deletions
@@ -17,6 +17,7 @@
    "@cosmjs/encoding": "^0.29.5",
    "@iconify/vue": "^4.1.0",
    "@intlify/unplugin-vue-i18n": "^0.8.2",
+    "@leapwallet/name-matcha": "^1.1.0",
    "@osmonauts/lcd": "^0.8.0",
    "@ping-pub/chain-registry-client": "^0.0.25",
    "@vitejs/plugin-vue-jsx": "^3.0.0",