Skip to content

Commit 294875b

Browse files
authored
Merge pull request #1458 from huww98/vendor-conflict
fix vendor conflict
2 parents 3c4ec63 + f5b7e59 commit 294875b

File tree

1 file changed

+27
-5
lines changed

1 file changed

+27
-5
lines changed

vendor/k8s.io/klog/v2/ktesting/testinglogger.go

Lines changed: 27 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)