From 04ee86e93cca84c4c3faf99686a75d969d9d4e1f Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 24 Jul 2021 17:10:04 -0600
Subject: [PATCH] rebase

---
 ledger/Cargo.toml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
index 9d63a7dcb3..95d60994e9 100644
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -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" }