Resolve conflict

rizkybiz · Mar 14, 2024 · 689306c · 689306c
1 parent 41b1134
commit 689306c
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/internal/services/storage/storage_account_resource.go b/internal/services/storage/storage_account_resource.go
@@ -1370,15 +1370,8 @@ func resourceStorageAccountCreate(d *pluginsdk.ResourceData, meta interface{}) e
 			AllowCrossTenantReplication:  &crossTenantReplication,
 			SasPolicy:                    expandStorageAccountSASPolicy(d.Get("sas_policy").([]interface{})),
 			IsSftpEnabled:                &isSftpEnabled,
-<<<<<<< HEAD
-<<<<<<< HEAD
 			IsLocalUserEnabled:           pointer.To(d.Get("local_user_enabled").(bool)),
-=======
-			DNSEndpointType:              dnsEndpointType,
->>>>>>> 44760707ba (WIP: `azurerm_storage_account`: Add support for `AzureDNSZone`)
-=======
 			DNSEndpointType:              storage.DNSEndpointType(dnsEndpointType),
->>>>>>> 1b5e523f0c (Rename property, add docs)
 		},
 	}