From 4a15a816ceaec3e42d63e9b3ee33829ced98c4f8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 28 Oct 2021 19:22:11 +0100 Subject: [PATCH] Polish 'Replace "via" with words more suited to an international audience' See gh-28464 --- .../spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc index 49284963f1..3f4b333bd0 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc @@ -434,11 +434,7 @@ You can also change the interval at which metrics are sent to New Relic: step: "30s" ---- -<<<<<<< HEAD By default, metrics are published through REST calls, but you can also use the Java Agent API if you have it on the classpath: -======= -By default, metrics are published through REST calls but it is also possible to use the Java Agent API if you have it on the classpath: ->>>>>>> Replace "via" with English words [source,yaml,indent=0,subs="verbatim",configprops,configblocks] ----