Fix merge conflict

elastic · Sep 25, 2023 · e4fba4b · e4fba4b
1 parent afa6043
commit e4fba4b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/management/connectors/pre-configured-connectors.asciidoc b/docs/management/connectors/pre-configured-connectors.asciidoc
@@ -118,12 +118,9 @@ Index names must start with `kibana-alert-history-` to take advantage of the pre
 * <<preconfigured-pagerduty-configuration>>
 * <<preconfigured-server-log-configuration>>
 * <<preconfigured-slack-configuration>>
-<<<<<<< HEAD
 * <<preconfigured-swimlane-configuration>>
 * <<preconfigured-torq-configuration>>
-=======
 * <<preconfigured-tines-configuration>>
->>>>>>> 07b87f0ab71 ([DOCS] Moves preconfigured Tines connector details)
 * <<preconfigured-webhook-configuration>>
 * <<preconfigured-cases-webhook-configuration>>
 * <<preconfigured-xmatters-configuration>>