diff --git a/controllers/vrg_recipe.go b/controllers/vrg_recipe.go index 43ae8314b7..a94a23e668 100644 --- a/controllers/vrg_recipe.go +++ b/controllers/vrg_recipe.go @@ -220,7 +220,6 @@ func recipesWatch(b *builder.Builder, m objectToReconcileRequestsMapper) *builde } func (m objectToReconcileRequestsMapper) recipeToVrgReconcileRequestsMapper( -<<<<<<< HEAD _ context.Context, rcp client.Object, ) []reconcile.Request {