Merge conflict resolved

leapwallet · Aug 2, 2023 · fa94d0d · fa94d0d
1 parent 815dac9
commit fa94d0d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/package.json b/package.json
@@ -23,14 +23,9 @@
     "lint:fix": "yarn lint:eslint --fix && yarn lint:misc --write",
     "lint:misc": "prettier '**/*.json' '**/*.md' '!**/CHANGELOG.md' '**/*.yml' --ignore-path .gitignore",
     "start": "yarn workspaces foreach --parallel --interlaced --verbose run start",
-<<<<<<< HEAD
-    "test": "echo \"TODO\"",
-    "start:snap": "yarn workspace snap start"
-=======
     "start:snap": "yarn workspace snap start",
     "build:provider": "yarn workspace @leapwallet/cosmos-snap-provider build",
     "test": "echo \"TODO\""
->>>>>>> 3e3664dc213ea80bd2f889120f3e661c7cadf1d5
   },
   "devDependencies": {
     "@metamask/eslint-config": "^10.0.0",

diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -7,11 +7,7 @@
     "url": "https://github.com/leapwallet/cosmos-metamask-snap.git"
   },
   "source": {
-<<<<<<< HEAD
-    "shasum": "F0492Mnms6SXudIoIzEscTpuhAoD5bTnBf+U+v6IX5Q=",
-=======
-    "shasum": "N7FF/rqOb8EudU8zDolOwRBso/ShuzrUT6mE/x+K0Xw="
->>>>>>> 3e3664dc213ea80bd2f889120f3e661c7cadf1d5
+    "shasum": "N7FF/rqOb8EudU8zDolOwRBso/ShuzrUT6mE/x+K0Xw=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",