merged

ava-labs · Jun 3, 2024 · 487f6fb · 487f6fb
1 parent 648274e
commit 487f6fb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tests/e2e/x/transfer/virtuous.go b/tests/e2e/x/transfer/virtuous.go
@@ -60,11 +60,7 @@ var _ = e2e.DescribeXChainSerial("[Virtuous Transfer Tx AVAX]", func() {
 				require.NoError(err)
 
 				for _, metrics := range allNodeMetrics {
-<<<<<<< HEAD
 					xBlksProcessing, ok := tests.GetMetricValue(metrics, blksProcessingMetric, xChainMetricLabels)
-=======
-					xBlksProcessing, ok := tests.GetMetricValue(metrics, xBlksProcessingMetric, nil)
->>>>>>> master
 					if !ok || xBlksProcessing > 0 {
 						return false
 					}