fix merge conflicts

2022-04-12 16:27:53 -05:00
parent beb64387a0
commit a0668c4084
1 changed files with 0 additions and 5 deletions
--- 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,