Merge pull request #5489 from ltearno/fixtypo-in-merge2

k8s-ci-robot · web-flow · commit b28e0445a2f1 · 2023-12-21T12:11:55.000+01:00
Fix typo in merge2
diff --git a/kyaml/yaml/merge2/merge2.go b/kyaml/yaml/merge2/merge2.go
@@ -45,9 +45,9 @@ func MergeStrings(srcStr, destStr string, infer bool, mergeOptions yaml.MergeOpt
 }
 
 type Merger struct {
-	// for forwards compatibility when new functions are added to the interface
 }
 
+// for forwards compatibility when new functions are added to the interface
 var _ walk.Visitor = Merger{}
 
 func (m Merger) VisitMap(nodes walk.Sources, s *openapi.ResourceSchema) (*yaml.RNode, error) {

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,9 @@ func MergeStrings(srcStr, destStr string, infer bool, mergeOptions yaml.MergeOpt`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`type Merger struct {`
`48`		`- // for forwards compatibility when new functions are added to the interface`
`49`	`48`	`}`
`50`	`49`
	`50`	`+// for forwards compatibility when new functions are added to the interface`
`51`	`51`	`var _ walk.Visitor = Merger{}`
`52`	`52`
`53`	`53`	`func (m Merger) VisitMap(nodes walk.Sources, s openapi.ResourceSchema) (yaml.RNode, error) {`