Polish 'Replace "via" with words more suited to an international audience'

See gh-28464
3 years ago · 4a15a816ce
parent 025c4c277b
commit 4a15a816ce
1 changed files with 0 additions and 4 deletions
--- 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]
 ----