Update docs/en/observability/index.asciidoc

elastic · Nov 7, 2024 · d031087 · d031087
1 parent 99bfbf8
commit d031087
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/en/observability/index.asciidoc b/docs/en/observability/index.asciidoc
@@ -146,11 +146,8 @@ include::profiling-tag-data-query.asciidoc[leveloffset=+4]
 include::profiling-add-symbols.asciidoc[leveloffset=+4]
 include::profiling-use-a-proxy.asciidoc[leveloffset=+4]
 include::profiling-no-kernel-version-check.asciidoc[leveloffset=+4]
-<<<<<<< HEAD
-=======
 include::profiling-envs.asciidoc[leveloffset=+4]
 include::profiling-config-file.asciidoc[leveloffset=+4]
->>>>>>> e335f277 (profiling: add documentation for the config file and CLI arguments (#4398))
 
 include::profiling-upgrade.asciidoc[leveloffset=+3]