Remove extra word

graalvm · Nov 24, 2023 · b3c359d · b3c359d
1 parent f400fdb
commit b3c359d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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 `<enabled>true</enabled>` in the `native-maven-plugin` plugin configuration: