Update docs/en/observability/logs-filter.asciidoc

elastic · Nov 18, 2024 · 9cbbf57 · 9cbbf57
1 parent 7547428
commit 9cbbf57
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/en/observability/logs-filter.asciidoc b/docs/en/observability/logs-filter.asciidoc
@@ -63,11 +63,7 @@ PUT _index_template/logs-example-default-template
 Filter your data using the fields you've extracted so you can focus on log data with specific log levels, timestamp ranges, or host IPs. You can filter your log data in different ways:
 
 - <<logs-filter-logs-explorer>> – Filter and visualize log data in {kib} using Logs Explorer.
-<<<<<<< HEAD
 - <<logs-filter-qdsl>> – Filter log data from Developer tools using Query DSL.
-=======
-- <<logs-filter-qdsl>> – Filter log data from Dev Tools using Query DSL.
->>>>>>> 2579aca0 (Fix Logs Explorer naming in outdated docs (#4318))
 
 [discrete]
 [[logs-filter-logs-explorer]]