Resolve merge conflict

flo-02-mu · Nov 5, 2020 · ea42116 · ea42116
1 parent 22bd025
commit ea42116
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/azurerm/internal/services/containers/kubernetes_cluster_resource.go b/azurerm/internal/services/containers/kubernetes_cluster_resource.go
@@ -179,10 +179,7 @@ func resourceArmKubernetesCluster() *schema.Resource {
 							ForceNew: true,
 							ValidateFunc: validation.StringInSlice([]string{
 								string(containerservice.ResourceIdentityTypeSystemAssigned),
-<<<<<<< HEAD
 								string(containerservice.ResourceIdentityTypeUserAssigned),
-=======
->>>>>>> master
 							}, false),
 						},
 						"user_assigned_identity_id": {