rebase
This commit is contained in:
@ -30,12 +30,7 @@ prost = "0.8.0"
|
||||
rand = "0.7.0"
|
||||
rand_chacha = "0.2.2"
|
||||
rayon = "1.5.0"
|
||||
<<<<<<< HEAD
|
||||
reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] }
|
||||
serde = "1.0.122"
|
||||
=======
|
||||
serde = "1.0.126"
|
||||
>>>>>>> 8a9b7f5ef (Disable reed-solomon-erasure/simd-accel feature on aarch64 (Apple M1))
|
||||
serde_bytes = "0.11.5"
|
||||
sha2 = "0.9.2"
|
||||
solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.7.9" }
|
||||
|
Reference in New Issue
Block a user