RHIDP-1923 Fix merge conflict in audit log file

Author: Gerry-Forde

assemblies/assembly-audit-log.adoc

@@ -33,7 +33,6 @@ Audit logs are not forwarded to the internal log store by default because this d
 * For a complete list of fields that a {product-short} audit log can include, see xref:ref-audit-log-fields.adoc_{context}[]
 * For a list of scaffolder events that a {product-short} audit log can include, see xref:ref-audit-log-scaffolder-events.adoc_{context}[]
 
-<<<<<<< HEAD
 include::modules/observe/con-audit-log-config.adoc[]
 
 include::modules/observe/proc-forward-audit-log-splunk.adoc[leveloffset=+2]
@@ -47,16 +46,3 @@ include::modules/observe/ref-audit-log-scaffolder-events.adoc[leveloffset=+2]
 include::modules/observe/ref-audit-log-catalog-events.adoc[leveloffset=+2]
 
 include::modules/observe/ref-audit-log-file-rotation-overview.adoc[]
-=======
-include::modules/observe/con-audit-log-config.adoc[leveloffset=+1]
-
-include::modules/observe/proc-audit-log-view.adoc[leveloffset=+1]
-
-include::modules/observe/ref-audit-log-fields.adoc[leveloffset=+2]
-
-include::modules/observe/ref-audit-log-scaffolder-events.adoc[leveloffset=+2]
-
-include::modules/observe/ref-audit-log-catalog-events.adoc[leveloffset=+2]
-
-include::modules/observe/ref-audit-log-file-rotation-overview.adoc[leveloffset=+1]
->>>>>>> c10a907 (RHIDP-4814: Move observe related content to new titles (#689))

modules/observe/con-audit-log-config.adoc

@@ -1,7 +1,5 @@
 // Module included in the following assemblies:
 // assembly-audit-log.adoc
-
-:_mod-docs-content-type: CONCEPT
 [id="con-audit-log-config_{context}"]
 = Configuring audit logs for {product-short} on {ocp-short}