From 1dc6eb3a58a99aa9af856a36187d990678919e27 Mon Sep 17 00:00:00 2001
From: priyawadhwa <priya@chainguard.dev>
Date: Wed, 9 Mar 2022 14:26:06 +0000
Subject: [PATCH] fix merge conflict (#720)
Signed-off-by: Priya Wadhwa <priya@chainguard.dev>
---
cmd/rekor-cli/app/log_info.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/rekor-cli/app/log_info.go b/cmd/rekor-cli/app/log_info.go
index 6bd6f96..3c8307e 100644
--- a/cmd/rekor-cli/app/log_info.go
+++ b/cmd/rekor-cli/app/log_info.go
@@ -118,7 +118,7 @@ var logInfoCmd = &cobra.Command{
TreeSize: swag.Int64Value(logInfo.TreeSize),
RootHash: swag.StringValue(logInfo.RootHash),
TimestampNanos: sth.GetTimestamp(),
- TreeID: swag.Int64Value(logInfo.TreeID),
+ TreeID: swag.StringValue(logInfo.TreeID),
}
oldState := state.Load(serverURL)
--
GitLab