resolving merge conflict

jorinmejia · Nov 4, 2021 · a36a0b4 · a36a0b4
1 parent b00f6c0
commit a36a0b4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json
@@ -4074,7 +4074,7 @@
       }
     },
     "AzureFirstPartyManagedCertificate": {
-      "description": "Azure FirstParty Managed Certificate provided by other first party rp's, used for https",
+      "description": "Azure FirstParty Managed Certificate provided by other first party rp's to enable HTTPS.",
       "allOf": [
         {
           "$ref": "#/definitions/Certificate"
@@ -4651,7 +4651,7 @@
       }
     },
     "AzureFirstPartyManagedCertificateParameters": {
-      "description": "Azure FirstParty Managed Certificate provided by other first party rp's, used for https",
+      "description": "Azure FirstParty Managed Certificate provided by other first party rp's to enable HTTPS.",
       "x-ms-discriminator-value": "AzureFirstPartyManagedCertificate",
       "type": "object",
       "allOf": [