Solved merge conflict

azure-sdk · Sep 7, 2022 · ab6f3d5 · ab6f3d5
1 parent 471394f
commit ab6f3d5
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
@@ -13261,24 +13261,6 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2022-05-01/Microsoft.Network.FrontDoor.json#/resourceDefinitions/FrontDoorWebApplicationFirewallPolicies"
         },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsForwardingRulesets"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsForwardingRulesets_forwardingRules"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsForwardingRulesets_virtualNetworkLinks"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsResolvers"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsResolvers_inboundEndpoints"
-        },
-        {
-          "$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsResolvers_outboundEndpoints"
-        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2015-05-01-preview/Microsoft.Network.NRP.json#/resourceDefinitions/applicationGateways"
         },