Skip to content

Commit 7e2ed92

Browse files
author
Prateek
committed
Remove the accidental merge conflict
Signed-off-by: Prateek <prateek@bluekanvas.com>
1 parent 075c962 commit 7e2ed92

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

metrics/serve.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,6 @@ func (c *Collector) Run() error {
505505
labelValues = append(labelValues, split[1])
506506
}
507507

508-
c.labelKeys = labelKeys
509508
mutableState := &metricState{seriesCount: c.cfg.SeriesCount, labelValues: labelValues}
510509
// unsafe means you need to lock c.mu to use it.
511510
unsafeReadOnlyGetState := func() metricState { return *mutableState }

0 commit comments

Comments
 (0)