BXMSDOC-8474-7.67.x-final: Resolved the merge conflicts. (#4273)

apache · Jul 5, 2022 · 171bc53 · 171bc53
1 parent 6056a22
commit 171bc53
Show file tree

Hide file tree

Showing 11 changed files with 263 additions and 577 deletions.
diff --git a/_artifacts/document-attributes.adoc b/_artifacts/document-attributes.adoc
@@ -1,6 +1,5 @@
 
-:REBUILT: Wednesday, June 15, 2022
-
+:REBUILT: Thursday, June 30, 2022
 
 :ENTERPRISE_VERSION: 8.0
 :ENTERPRISE_VERSION_LONG: 8.0.0

diff --git a/assemblies/assembly-release-notes.adoc b/assemblies/assembly-release-notes.adoc
@@ -12,7 +12,7 @@ include::_artifacts/snip-conscious-language.adoc[]
 
 include::{enterprise-dir}/release-notes/rn-intro-con.adoc[leveloffset=+1]
 
-include::{enterprise-dir}/release-notes/rn-kogito-productize-features-ref.adoc[leveloffset=+1]
+//include::{enterprise-dir}/release-notes/rn-kogito-productize-features-ref.adoc[leveloffset=+1]
 
 include::{enterprise-dir}/release-notes/rn-whats-new-con.adoc[leveloffset=+1]
 
@@ -22,17 +22,9 @@ include::{enterprise-dir}/release-notes/rn-deprecated-issues-ref.adoc[leveloffse
 
 include::{enterprise-dir}/release-notes/rn-tech-preview-ref.adoc[leveloffset=+1]
 
-include::{enterprise-dir}/release-notes/rn-7.12-known-issues-ref.adoc[leveloffset=+1]
+include::{enterprise-dir}/release-notes/rn-7.13-known-issues-ref.adoc[leveloffset=+1]
 
-ifdef::PAM[]
-
-include::{enterprise-dir}/release-notes/rn-7.12.1-known-issues-ref.adoc[leveloffset=+1]
-
-endif::PAM[]
-
-include::{enterprise-dir}/release-notes/rn-7.12-fixed-issues-ref.adoc[leveloffset=+1]
-
-include::{enterprise-dir}/release-notes/rn-7.12.1-fixed-issues-ref.adoc[leveloffset=+1]
+include::{enterprise-dir}/release-notes/rn-7.13-fixed-issues-ref.adoc[leveloffset=+1]
 
 ifdef::parent-context[:context: {parent-context}]
 ifndef::parent-context[:!context:]
diff --git a/doc-content/enterprise-only/release-notes/rn-7.12-fixed-issues-ref.adoc b/doc-content/enterprise-only/release-notes/rn-7.12-fixed-issues-ref.adoc
diff --git a/doc-content/enterprise-only/release-notes/rn-7.12-known-issues-ref.adoc b/doc-content/enterprise-only/release-notes/rn-7.12-known-issues-ref.adoc