Skip to content

Commit

Permalink
fix: conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
crypto-matto committed Jul 29, 2024
2 parents 1b334c0 + c0c946f commit 98f2767
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Warning
Crypto.com DeFi Desktop Wallet may subject to changes. Before proceeding, please be aware of the following:

- This product is in maintenance mode.
- Crypto.com is not liable for any potential damage, loss of data/files arising from the use of the wallet.

## Latest releases
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"electron-log": "4.3.5",
"electron-reload": "1.5.0",
"electron-store": "8.0.1",
"electron-updater": "6.3.0-alpha.6",
"electron-updater": "6.3.0",
"eth-sig-util": "3.0.1",
"ethereumjs-tx": "2.1.2",
"ethers": "5.4.4",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7295,10 +7295,10 @@ [email protected]:
debug "^4.3.4"
sax "^1.2.4"

[email protected]-alpha.3:
version "9.2.5-alpha.3"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.5-alpha.3.tgz#1033ec82a5237955a0b1c6e92803e7317ddb83c1"
integrity sha512-ugXSJSbYBpaYeXpk2Rxa2QZdT67oRz3FFu3Lud4XK0Ijqe+OXwyAyCM4pGXJEO3VSdUn43AOJ5bUZ3gsCdQAIw==
[email protected]:
version "9.2.5"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz#0afdffa0adb5c84c14926c7dd2cf3c6e96e9be83"
integrity sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg==
dependencies:
debug "^4.3.4"
sax "^1.2.4"
Expand Down Expand Up @@ -9553,12 +9553,12 @@ electron-to-chromium@^1.4.668:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.783.tgz#933887165b8b6025a81663d2d97cf4b85cde27b2"
integrity sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ==

[email protected]-alpha.6:
version "6.3.0-alpha.6"
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.3.0-alpha.6.tgz#b1980b9f3013d571ef26612a5bfb6b3feb0d1a20"
integrity sha512-4tr+KI5BtEoHzW8Vr5rbsYxYOentXcDu1LOqM/F1V/s/R8PTVI9nIlbqVN6JzOP+Gtf6uKC8i+JvsVxdcKH/aQ==
[email protected]:
version "6.3.0"
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.3.0.tgz#13a5c3c3f0b2b114fe33181e24a8270096734b3e"
integrity sha512-3Xlezhk+dKaSQrOnkQNqCGiuGSSUPO9BV9TQZ4Iig6AyTJ4FzJONE5gFFc382sY53Sh9dwJfzKsA3DxRHt2btw==
dependencies:
builder-util-runtime "9.2.5-alpha.3"
builder-util-runtime "9.2.5"
fs-extra "^10.1.0"
js-yaml "^4.1.0"
lazy-val "^1.0.5"
Expand Down

0 comments on commit 98f2767

Please sign in to comment.