Skip to content

Commit

Permalink
address review comment
Browse files Browse the repository at this point in the history
  • Loading branch information
kmala committed Jul 7, 2023
1 parent 6371a4d commit 69bc7e7
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion merge/conflict_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ func TestToSet(t *testing.T) {
}

func TestConflictsFromManagers(t *testing.T) {

got := merge.ConflictsFromManagers(fieldpath.ManagedFields{
"Bob": fieldpath.NewVersionedSet(
_NS(
Expand Down

0 comments on commit 69bc7e7

Please sign in to comment.