diff --git a/docs/src/docs/asciidoc/maven-plugin-quickstart.adoc b/docs/src/docs/asciidoc/maven-plugin-quickstart.adoc index 58b62612..8c0dcb38 100644 --- a/docs/src/docs/asciidoc/maven-plugin-quickstart.adoc +++ b/docs/src/docs/asciidoc/maven-plugin-quickstart.adoc @@ -314,8 +314,12 @@ With this plugin you can already build a native executable directly with Maven b == Build a Native Executable by Detecting Resources with the Agent +<<<<<<< HEAD This demo application and requires metadata before building a native executable. You do not have to configure anything manually: the plugin can generate the required configuration for you by injecting the https://graalvm.github.io/native-build-tools/latest/maven-plugin.html#agent-support[tracing agent] at package time. +======= +This demo application requires metadata before building a native executable. You do not have to configure anything manually: the plugin can generate the required configuration for you by injecting the https://graalvm.github.io/native-build-tools/latest/maven-plugin.html#agent-support[tracing agent] at package time. +>>>>>>> 24e5db3b (Remove extra word) The agent is disabled by default, and can be enabled in project's _pom.xml_ file or via the command line. . To enable the agent via the _pom.xml_ file, specify `true` in the `native-maven-plugin` plugin configuration: