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

Update Cargo.toml

Browse Source
This commit is contained in:
Michael Vines
2021-04-05 13:35:48 -07:00
parent 270749185c
commit 8d2337ccf8
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
faucet/Cargo.toml
View File

@ -16,23 +16,13 @@ clap = "2.33"
log = "0.4.11"
serde = "1.0.122"
serde_derive = "1.0.103"
<<<<<<< HEAD
solana-clap-utils = { path = "../clap-utils", version = "=1.6.5" }
solana-cli-config = { path = "../cli-config", version = "=1.6.5" }
solana-logger = { path = "../logger", version = "=1.6.5" }
solana-metrics = { path = "../metrics", version = "=1.6.5" }
solana-sdk = { path = "../sdk", version = "=1.6.5" }
solana-version = { path = "../version", version = "=1.6.5" }
tokio = { version = "1.1", features = ["full"] }
=======
solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
solana-logger = { path = "../logger", version = "=1.7.0" }
solana-metrics = { path = "../metrics", version = "=1.7.0" }
solana-sdk = { path = "../sdk", version = "=1.7.0" }
solana-version = { path = "../version", version = "=1.7.0" }
tokio = { version = "1", features = ["full"] }
>>>>>>> 43feef736... Adjust tokio version to just "1"
[lib]
crate-type = ["lib"]