cleanup

Signed-off-by: Gerd Oberlechner <[email protected]>
Azure · May 8, 2024 · 96632dc · 96632dc
1 parent 600a7b0
commit 96632dc
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/dev-infrastructure/templates/svc-cluster.bicep b/dev-infrastructure/templates/svc-cluster.bicep
@@ -29,13 +29,11 @@ param disableLocalAuth bool
 @description('Deploy ARO HCP RP Azure Cosmos DB if true')
 param deployFrontendCosmos bool
 
-<<<<<<< HEAD
 @description('List of workload identities to create and their required values')
 param workloadIdentities array
-=======
+
 @description('Deploy ARO HCP Maestro Infrastructure if true')
 param deployMaestroInfra bool
->>>>>>> 0b85144 ([draft] setting up event grid namespaces infrastructure and SVC cluster access)
 
 module svcCluster '../modules/aks-cluster-base.bicep' = {
   name: 'svc-cluster'