Skip to content

Commit be696cc

Browse files
authored
fix bad merge conflict resolution (#4401)
1 parent fc4e2d1 commit be696cc

File tree

3 files changed

+207
-185
lines changed

3 files changed

+207
-185
lines changed

controllers/ingress/group_controller.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,6 @@ func (r *groupReconciler) setupWatches(_ context.Context, c controller.Controlle
400400
return nil
401401
}
402402

403-
404403
func isIngressStatusEqual(a, b []networking.IngressLoadBalancerIngress) bool {
405404
if len(a) != len(b) {
406405
return false

0 commit comments

Comments
 (0)