From 07a6b597d0557b8ba5aaac6ffc23a57139ef41ed Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sun, 13 Mar 2022 16:27:16 -0700
Subject: [PATCH] Update Cargo.toml

---
 ledger-tool/Cargo.toml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 63b7cb22cb..497a96fc43 100644
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -15,13 +15,8 @@ bytecount = "0.6.2"
 clap = "2.33.1"
 csv = "1.1.6"
 dashmap = "4.0.2"
-<<<<<<< HEAD
-histogram = "*"
-itertools = "0.10.1"
-=======
 histogram = "0.6.9"
-itertools = "0.10.3"
->>>>>>> 01b6f97f0 (Pin histogram crate version to fix cargo publish)
+itertools = "0.10.1"
 log = { version = "0.4.14" }
 regex = "1"
 serde = { version = "1.0", features = ["derive"] }