blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve conflicts of 506ee0014a revert

This commit is contained in:
Dmitri Makarov 2022-05-20 20:32:06 -07:00 committed by Dmitri Makarov
parent 108795755b
commit dfefc01c7b
2 changed files with 69 additions and 391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

451
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

9
rbpf-cli/Cargo.toml
View File

@ -11,17 +11,8 @@ publish = false
[dependencies] [dependencies]
clap = { version = "3.1.5", features = ["cargo"] } clap = { version = "3.1.5", features = ["cargo"] }
<<<<<<< HEAD
gimli = "0.26.1"
goblin = { version = "0.5.1", features = ["std"] }
itertools = "0.10.3"
log = { version = "0.4.17", features = ["std"] }
serde = "1.0.137" serde = "1.0.137"
serde_json = "1.0.81" serde_json = "1.0.81"
=======
serde = "1.0.136"
serde_json = "1.0.79"
>>>>>>> parent of 506ee0014a (rbpf-cli: add coverage flag)
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.11.0" } solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.11.0" }
solana-logger = { path = "../logger", version = "=1.11.0" } solana-logger = { path = "../logger", version = "=1.11.0" }
solana-program-runtime = { path = "../program-runtime", version = "=1.11.0" } solana-program-runtime = { path = "../program-runtime", version = "=1.11.0" }