Skip to content

Commit

Permalink
chore: fix merge conflict errors
Browse files Browse the repository at this point in the history
  • Loading branch information
wemeetagain committed Oct 6, 2023
1 parent 607453a commit bc0378e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@
},
"./hashes/sha1": {
"types": "./dist/types/src/hashes/sha1.d.ts",
"browser": "./src/hashes/sha1-browser.js",
"import": "./src/hashes/sha1.js"
"browser": "./dist/src/hashes/sha1-browser.js",
"import": "./dist/src/hashes/sha1.js"
},
"./hashes/sha2": {
"types": "./dist/src/hashes/sha2.d.ts",
Expand All @@ -176,9 +176,9 @@
},
"browser": {
"./hashes/sha1": "./dist/src/hashes/sha1-browser.js",
"./src/hashes/sha1.js": "./dist/src/hashes/sha1-browser.js",
"./dist/src/hashes/sha1.js": "./dist/src/hashes/sha1-browser.js",
"./hashes/sha2": "./dist/src/hashes/sha2-browser.js",
"./src/hashes/sha2.js": "./dist/src/hashes/sha2-browser.js"
"./dist/src/hashes/sha2.js": "./dist/src/hashes/sha2-browser.js"
},
"eslintConfig": {
"extends": "ipfs",
Expand Down

0 comments on commit bc0378e

Please sign in to comment.