cleanup after rebase

elastic · Jan 28, 2020 · 8a55add · 8a55add
1 parent 95c3d1d
commit 8a55add
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/docs/en/siem/cases-api-delete-case.asciidoc b/docs/en/siem/cases-api-delete-case.asciidoc
@@ -1,5 +1,5 @@
 [[cases-api-delete-case]]
-=== Delete comment
+=== Delete case
 
 Deletes the specified case and all associated comments.
 

diff --git a/docs/en/siem/index.asciidoc b/docs/en/siem/index.asciidoc
@@ -20,13 +20,12 @@ include::machine-learning.asciidoc[]
 
 include::tune-anomaly-results.asciidoc[]
 
-<<<<<<< HEAD
 include::detection-engine-intro.asciidoc[]
 
 include::rules-ui-create.asciidoc[]
 
 include::prebuilt-rule-reference.asciidoc[]
-=======
+
 include::cases-api.asciidoc[]
 
 include::cases-api-create.asciidoc[]
@@ -47,5 +46,4 @@ include::cases-api-get-comment.asciidoc[]
 
 include::cases-api-delete-comment.asciidoc[]
 
-include::cases-api-delete-case.asciidoc[]
->>>>>>> intial case api docs
+include::cases-api-delete-case.asciidoc[]