From cbdf6f31a98478154090ccd6e6b86c4cfe9b06d5 Mon Sep 17 00:00:00 2001
From: brooks <brooks@solana.com>
Date: Thu, 21 Sep 2023 08:43:45 -0500
Subject: [PATCH] resolve merge conflicts

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

diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
index 07a406db467d0e..fa4e09ef420914 100644
--- 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")