Skip to content

Fix merge conflict with PR#26070 and PR#26521 typo in 4-7#29116

Merged
bobfuru merged 1 commit intoopenshift:enterprise-4.7from
bobfuru:fix-conflict-26070-26521-4-7
Feb 3, 2021
Merged

Fix merge conflict with PR#26070 and PR#26521 typo in 4-7#29116
bobfuru merged 1 commit intoopenshift:enterprise-4.7from
bobfuru:fix-conflict-26070-26521-4-7

Conversation

@bobfuru
Copy link
Copy Markdown
Contributor

@bobfuru bobfuru commented Feb 3, 2021

Fixes a merge conflict caused by a typo in example headers, related to #26070 and #26521.
@openshift/team-documentation PTAL

@bobfuru bobfuru added peer-review-needed Signifies that the peer review team needs to review this PR branch/enterprise-4.7 labels Feb 3, 2021
@bobfuru bobfuru added this to the Next Release milestone Feb 3, 2021
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 3, 2021
@netlify
Copy link
Copy Markdown

netlify Bot commented Feb 3, 2021

Deploy preview for osdocs ready!

Built with commit 11aa193

https://deploy-preview-29116--osdocs.netlify.app

Copy link
Copy Markdown
Contributor

@bergerhoffer bergerhoffer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@bobfuru bobfuru merged commit 5fc489b into openshift:enterprise-4.7 Feb 3, 2021
@bergerhoffer bergerhoffer added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Feb 3, 2021
@bobfuru bobfuru deleted the fix-conflict-26070-26521-4-7 branch February 3, 2021 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants