From f56cd20ab364c0e6b9f2a1e2547047966f9b1c7b Mon Sep 17 00:00:00 2001 From: Nastasha Solomon <79124755+nastasha-solomon@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:14:23 -0400 Subject: [PATCH 1/2] [BUG] Alerts can be deleted in the case history (#4756) * Updating note * Minor edit * Update docs/detections/alerts-add-to-cases.asciidoc (cherry picked from commit cdf7f904bffaba720bc891be8986167c2affee30) # Conflicts: # docs/detections/alerts-add-to-cases.asciidoc --- docs/detections/alerts-add-to-cases.asciidoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/detections/alerts-add-to-cases.asciidoc b/docs/detections/alerts-add-to-cases.asciidoc index af943e3778..47b3204350 100644 --- a/docs/detections/alerts-add-to-cases.asciidoc +++ b/docs/detections/alerts-add-to-cases.asciidoc @@ -3,7 +3,11 @@ From the Alerts table, you can attach one or more alerts to a <> or <>. Alerts from any rule type can be added to a case. +<<<<<<< HEAD NOTE: Once you've added an alert to a case, you can only remove it through the <>. +======= +NOTE: After you add an alert to a case, you can remove it from the case activity under the alert summary or by using the <>. +>>>>>>> cdf7f904 ([BUG] Alerts can be deleted in the case history (#4756)) [role="screenshot"] image::images/add-alert-to-case.gif[width=50%][height=50%][Animation of adding an alert to a case] From f501839b52382cf344d5663a2aa64dd519f75fbf Mon Sep 17 00:00:00 2001 From: "nastasha.solomon" Date: Thu, 14 Mar 2024 16:53:51 -0400 Subject: [PATCH 2/2] Fixed conflict --- docs/detections/alerts-add-to-cases.asciidoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/detections/alerts-add-to-cases.asciidoc b/docs/detections/alerts-add-to-cases.asciidoc index 47b3204350..eec0f4e5dd 100644 --- a/docs/detections/alerts-add-to-cases.asciidoc +++ b/docs/detections/alerts-add-to-cases.asciidoc @@ -3,11 +3,7 @@ From the Alerts table, you can attach one or more alerts to a <> or <>. Alerts from any rule type can be added to a case. -<<<<<<< HEAD -NOTE: Once you've added an alert to a case, you can only remove it through the <>. -======= NOTE: After you add an alert to a case, you can remove it from the case activity under the alert summary or by using the <>. ->>>>>>> cdf7f904 ([BUG] Alerts can be deleted in the case history (#4756)) [role="screenshot"] image::images/add-alert-to-case.gif[width=50%][height=50%][Animation of adding an alert to a case]