fix merge conflict (sigstore#720)

priyawadhwa · web-flow · commit 1dc6eb3a58a9 · 2022-03-09T08:26:06.000-06:00
Signed-off-by: Priya Wadhwa &lt;priya@chainguard.dev&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ var logInfoCmd = &cobra.Command{`
`118`	`118`	`TreeSize: swag.Int64Value(logInfo.TreeSize),`
`119`	`119`	`RootHash: swag.StringValue(logInfo.RootHash),`
`120`	`120`	`TimestampNanos: sth.GetTimestamp(),`
`121`		`- TreeID: swag.Int64Value(logInfo.TreeID),`
	`121`	`+ TreeID: swag.StringValue(logInfo.TreeID),`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`oldState := state.Load(serverURL)`