From a0668c408416c733c2bceadf60fac576562e7911 Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)" <wash678@gmail.com>
Date: Tue, 12 Apr 2022 16:27:53 -0500
Subject: [PATCH] fix merge conflicts

---
 ledger-tool/src/main.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
index a237e0b9e1..6eaf71d012 100644
--- a/ledger-tool/src/main.rs
+++ b/ledger-tool/src/main.rs
@@ -33,13 +33,8 @@ use {
     },
     solana_measure::measure::Measure,
     solana_runtime::{
-<<<<<<< HEAD
         accounts_db::AccountsDbConfig,
-        accounts_index::{AccountsIndexConfig, ScanConfig},
-=======
-        accounts_db::{AccountsDbConfig, FillerAccountsConfig},
         accounts_index::{AccountsIndexConfig, IndexLimitMb, ScanConfig},
->>>>>>> 1bc49d219 (IndexLimitMb option adds 'Unspecified' state (#24249))
         bank::{Bank, RewardCalculationEvent},
         bank_forks::BankForks,
         cost_model::CostModel,