resolve merge conflict

ejarvi · ejarvi · commit a761c28648d7 · 2018-04-24T16:14:53.000-07:00
diff --git a/src/ResourceManager/Compute/Commands.Compute/help/Set-AzureRmVMDiskEncryptionExtension.md b/src/ResourceManager/Compute/Commands.Compute/help/Set-AzureRmVMDiskEncryptionExtension.md
@@ -252,13 +252,8 @@ Specifies the client ID of the Azure AD application that has permissions to writ
 
 ```yaml
 Type: String
-<<<<<<< HEAD
 Parameter Sets: AADClientCertParameterSet, AADClientSecretParameterSet
 Aliases: 
-=======
-Parameter Sets: (All)
-Aliases:
->>>>>>> upstream/preview
 
 Required: True
 Position: 2
