Skip to content

delete#13921

Merged
k8s-ci-robot merged 1 commit intomasterfrom
unknown repository
Apr 22, 2019
Merged

delete#13921
k8s-ci-robot merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Apr 20, 2019

Learn from other people's mistakes, you don't have time to make your own.

Previous doc page had `<<<<<<< HEAD`, `=======` and `>>>>>>> upstream/master`
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 20, 2019
@k8s-ci-robot k8s-ci-robot added language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Apr 20, 2019
@netlify
Copy link
Copy Markdown

netlify bot commented Apr 20, 2019

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 41fd76f

https://deploy-preview-13921--kubernetes-io-master-staging.netlify.com

Copy link
Copy Markdown
Member

@rlenferink rlenferink left a comment

Choose a reason for hiding this comment

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

Welcome to k8s Docs and thanks for fixing this 🎉

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 21, 2019
@tengqm
Copy link
Copy Markdown
Contributor

tengqm commented Apr 22, 2019

/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 22, 2019
@k8s-ci-robot k8s-ci-robot merged commit 1c419ce into kubernetes:master Apr 22, 2019
@ghost ghost changed the title Fix Git merge conflict delete May 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. 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