fix merge conflict junk #91516
Merged
fix merge conflict junk #91516
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jeana-redhat
added
the
peer-review-needed
openshift-ci
bot
added
the
size/XS
|
🤖 Wed Apr 02 14:47:35 - Prow CI generated the docs preview: |
|
@jeana-redhat: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
/label peer-review-in-progress |
openshift-ci
bot
added
the
peer-review-in-progress
|
/label peer-review-done |
openshift-ci
bot
added
peer-review-done
jeana-redhat
merged commit 34de84e
into
openshift:ocp-docs-cluster_infra_reorg
2 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Version(s):
N/A
Issue:
N/A
Link to docs preview:
https://91516--ocpdocs-pr.netlify.app/openshift-enterprise/latest/machine_management/creating_machinesets/creating-infrastructure-machinesets.html#nodes-cluster-resource-override-move-infra_creating-infrastructure-machinesets (link at the end)
QE review:
N/A
Additional information: