Skip to content

Commit

Permalink
Resolve conflicts against dev-1.13 for /ko contents (#11439)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gochist @k8s-ci-robot
gochist authored and k8s-ci-robot committed Dec 1, 2018
1 parent 1e933a1 commit 1feb401
Showing 1 changed file with 69 additions and 71 deletions.
Loading

0 comments on commit 1feb401

Please sign in to comment.