Skip to content

Commit

Permalink
merge conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
floreks committed Jul 17, 2024
1 parent b755853 commit c37c3e7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/applier/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (cb *commonBuilder) finalize() (*commonBuilder, error) {
Labels: common.ManagedByAgentLabelSelector(),
Fields: nil,
},
}, "applier")
})
}
return &cx, nil
}
Expand Down

0 comments on commit c37c3e7

Please sign in to comment.