Fix Git merge conflict (#13921)

Browse Source

Previous doc page had `<<<<<<< HEAD`, `=======` and `>>>>>>> upstream/master`

...

This commit is contained in:

Brad Erhart

2019-04-21 22:59:44 -07:00

committed by Kubernetes Prow Robot

parent b19deca7a3

commit 1c419ce7c4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available