kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 01:50:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Remove dead merge conflict code.

Browse Source
This commit is contained in:
monopole
2021-03-17 06:35:30 -07:00
parent eb48b1b718
commit 6f6d41f17f
20 changed files with 29 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/internal/target/maker_test.go
View File

@@ -36,8 +36,7 @@ func makeKustTargetWithRf(
if err != nil {
t.Fatal(err)
}
rf := resmap.NewFactory(
pvd.GetResourceFactory(), pvd.GetConflictDetectorFactory())
rf := resmap.NewFactory(pvd.GetResourceFactory())
pc := konfig.DisabledPluginConfig()
return target.NewKustTarget(
ldr,