Skip to content
Snippets Groups Projects
Unverified Commit 1dc6eb3a authored by priyawadhwa's avatar priyawadhwa Committed by GitHub
Browse files

fix merge conflict (#720) 


Signed-off-by: default avatarPriya Wadhwa <priya@chainguard.dev>
parent c48fc87c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
cmd/rekor-cli/app/log_info.go
+ 1
− 1
View file @ 1dc6eb3a
...@@ -118,7 +118,7 @@ var logInfoCmd = &cobra.Command{ ...@@ -118,7 +118,7 @@ var logInfoCmd = &cobra.Command{
TreeSize: swag.Int64Value(logInfo.TreeSize), TreeSize: swag.Int64Value(logInfo.TreeSize),
RootHash: swag.StringValue(logInfo.RootHash), RootHash: swag.StringValue(logInfo.RootHash),
TimestampNanos: sth.GetTimestamp(), TimestampNanos: sth.GetTimestamp(),
TreeID: swag.Int64Value(logInfo.TreeID), TreeID: swag.StringValue(logInfo.TreeID),
} }
oldState := state.Load(serverURL) oldState := state.Load(serverURL)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment