Code

Remove dead merge conflict code.#3734

Code

Merged

k8s-ci-robot merged 1 commit intokubernetes-sigs:masterkubernetes-sigs/kustomize:masterfrom monopole:removeMergeConflictCodemonopole/kustomize:removeMergeConflictCodeCopy head branch name to clipboardMar 17, 2021

+29-604

Commits

Commits on Mar 17, 2021

• Remove dead merge conflict code.

  monopole

  committed
  6f6d41f

  Copy full SHA for 6f6d41f