mirror of https://github.com/k3s-io/k3s
5232ad4a00
Automatic merge from submit-queue (batch tested with PRs 64664, 65836, 65917). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. remove stray comment from a merge Signed-off-by: Davanum Srinivas <davanum@gmail.com> **What this PR does / why we need it**: Remove stray comment from a merge. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` |
||
|---|---|---|
| .. | ||
| config | ||
| options | ||
| BUILD | ||
| apps.go | ||
| autoscaling.go | ||
| batch.go | ||
| bootstrap.go | ||
| certificates.go | ||
| cloudproviders.go | ||
| controller_manager_test.go | ||
| controllermanager.go | ||
| core.go | ||
| import_known_versions.go | ||
| plugins.go | ||
| policy.go | ||
| rbac.go | ||