Resolve merge conflicts (#749)

Author: jmagak

assemblies/assembly-about-rhdh.adoc

@@ -21,4 +21,4 @@ Use {product} to simplify decision-making through a selection of internally appr
 
 include::modules/about/con-benefits-of-rhdh.adoc[leveloffset=+1]
 include::modules/about/ref-supported-platforms.adoc[leveloffset=+1]
-include::modules/about/ref-rhdh-sizing.adoc[leveloffset=+1]
+include::modules/about/ref-rhdh-sizing.adoc[leveloffset=+1]

titles/about/docinfo.xml

@@ -8,4 +8,4 @@
 <authorgroup>
   <orgname>{company-name} Customer Content Services</orgname>
 </authorgroup>
-<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />