diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-11-03 11:29:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 11:29:25 -0700 |
| commit | fc6d901b9302e528ecc5d3cdab7aa8f31f7cddb8 (patch) | |
| tree | e3924bb8967c8ad5adca29160c2ba6aa8b4f6f06 /vendor/github.com | |
| parent | 43c5ead3910fddc116fb95be49877a0d3dba7ab9 (diff) | |
| parent | 42822a3aa232b7bddbd27e965708d69c5ba9f37e (diff) | |
Merge pull request #1329 from chenhonggc/preserve-order-in-strategic-merge-patch
Automatic merge from submit-queue.
change preserve-order-in-strategic-merge-patch.md
I think `convered ` should be `covered `.
Diffstat (limited to 'vendor/github.com')
0 files changed, 0 insertions, 0 deletions