Skip to content

Manual Cherry-pick to release-1.3-Resolve merge conflicts #749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
themr0c merged 3 commits into from
Nov 28, 2024
Merged

Manual Cherry-pick to release-1.3-Resolve merge conflicts #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c9b39a
Resolve merge conflicts
jmagak Nov 27, 2024
7568815
Merge branch 'release-1.3' into Manual-cherry-pick-to-release-1.3-rhd…
jmagak Nov 28, 2024
f9b216c
Merge branch 'release-1.3' into Manual-cherry-pick-to-release-1.3-rhd…
jmagak Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assemblies/assembly-about-rhdh.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion titles/about/docinfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />