merged

ava-labs · Nov 24, 2023 · 369134a · 369134a
1 parent 25a7199
commit 369134a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/snow/consensus/snowman/metrics.go b/snow/consensus/snowman/metrics.go
@@ -48,10 +48,6 @@ type metrics struct {
 	// latAccepted tracks the number of nanoseconds that a block was processing
 	// before being accepted
 	latAccepted          metric.Averager
-<<<<<<< HEAD
-	blockSizeAcceptedSum prometheus.Gauge
-=======
->>>>>>> dev
 	buildLatencyAccepted prometheus.Gauge
 
 	blockSizeRejectedSum prometheus.Gauge