address review comment

kmala · kmala · commit 69bc7e73e77e · 2023-07-07T11:09:31.000-07:00
diff --git a/merge/conflict_test.go b/merge/conflict_test.go
@@ -94,7 +94,6 @@ func TestToSet(t *testing.T) {
 }
 
 func TestConflictsFromManagers(t *testing.T) {
-
 	got := merge.ConflictsFromManagers(fieldpath.ManagedFields{
 		"Bob": fieldpath.NewVersionedSet(
 			_NS(

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ func TestToSet(t *testing.T) {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`func TestConflictsFromManagers(t *testing.T) {`
`97`		`-`
`98`	`97`	`got := merge.ConflictsFromManagers(fieldpath.ManagedFields{`
`99`	`98`	`"Bob": fieldpath.NewVersionedSet(`
`100`	`99`	`_NS(`