Fix linters

Signed-off-by: Elena Gershkovich <[email protected]>
RamenDR · Jan 17, 2024 · bfb2bc1 · bfb2bc1
1 parent 31349f5
commit bfb2bc1
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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 {