gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Justin Starry
2021-09-25 09:40:18 -04:00
committed by Justin Starry
parent 66a9e6bcb4
commit 1a88a9eb0e
6 changed files with 48 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cli/Cargo.toml
View File

@@ -47,14 +47,9 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.6.27
solana-version = { path = "../version", version = "=1.6.27" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.27" }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
<<<<<<< HEAD
thiserror = "1.0.21"
tiny-bip39 = "0.7.0"
url = "2.1.1"
=======
thiserror = "1.0.29"
tiny-bip39 = "0.8.1"
>>>>>>> 038d77347 (chore: bump tiny-bip39 from 0.8.0 to 0.8.1 (#20136))
url = "2.1.1"
[dev-dependencies]
solana-core = { path = "../core", version = "=1.6.27" }