Update modules/ROOT/pages/monitoring/metrics/reference.adoc

akarasavov · NataliaIvakina · akarasavov · commit a1f5950760fe · 2024-07-25T12:43:12.000+01:00
Co-authored-by: NataliaIvakina &lt;82437520+NataliaIvakina@users.noreply.github.com&gt;
diff --git a/modules/ROOT/pages/monitoring/metrics/reference.adoc b/modules/ROOT/pages/monitoring/metrics/reference.adoc
@@ -426,7 +426,6 @@ label:deprecated[Deprecated in 5.15]
 [[discovery-service-V1]]
 === Discovery metrics v1
 
-<<<<<<< Updated upstream
 .Discovery service V1
 
 [options="header",cols="<3m,<4"]
