From c60705ec4773a861d5f7c1a23bab3429f1aaf6cb Mon Sep 17 00:00:00 2001
From: Rizwana777 <rizwananaaz177@gmail.com>
Date: Wed, 24 Jan 2024 15:45:08 +0530
Subject: [PATCH] Fix conflicts

Signed-off-by: Rizwana777 <rizwananaaz177@gmail.com>
---
 controllers/argocd/route_test.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/controllers/argocd/route_test.go b/controllers/argocd/route_test.go
index 412c8ed7c..4e365beb0 100644
--- a/controllers/argocd/route_test.go
+++ b/controllers/argocd/route_test.go
@@ -240,6 +240,7 @@ func TestReconcileRouteForShorteningHostname(t *testing.T) {
 	sch := makeTestReconcilerScheme(argoproj.AddToScheme, configv1.Install, routev1.Install)
 	cl := makeTestReconcilerClient(sch, resObjs, subresObjs, runtimeObjs)
 	r := makeTestReconciler(cl, sch)
+
 	assert.NoError(t, createNamespace(r, argoCD.Namespace, ""))
 
 	req := reconcile.Request{