resolve merge conflicts

solana-labs · Sep 21, 2023 · 300e2b6 · 300e2b6
1 parent ecaad7b
commit 300e2b6
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
@@ -1135,14 +1135,6 @@ fn main() {
         .value_name("PATHS")
         .takes_value(true)
         .help("Comma separated persistent accounts location");
-<<<<<<< HEAD
-=======
-    let accounts_hash_cache_path_arg = Arg::with_name("accounts_hash_cache_path")
-        .long("accounts-hash-cache-path")
-        .value_name("PATH")
-        .takes_value(true)
-        .help("Use PATH as accounts hash cache location [default: <LEDGER>/accounts_hash_cache]");
->>>>>>> 1d39c3167d (Adds default info to cli arg for --accounts-hash-cache-path (#33331))
     let accounts_index_path_arg = Arg::with_name("accounts_index_path")
         .long("accounts-index-path")
         .value_name("PATH")