Skip to content

Commit ab6f3d5

Browse files
Solved merge conflict
1 parent 471394f commit ab6f3d5

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

schemas/common/autogeneratedResources.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13261,24 +13261,6 @@
1326113261
{
1326213262
"$ref": "https://schema.management.azure.com/schemas/2022-05-01/Microsoft.Network.FrontDoor.json#/resourceDefinitions/FrontDoorWebApplicationFirewallPolicies"
1326313263
},
13264-
{
13265-
"$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsForwardingRulesets"
13266-
},
13267-
{
13268-
"$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsForwardingRulesets_forwardingRules"
13269-
},
13270-
{
13271-
"$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsForwardingRulesets_virtualNetworkLinks"
13272-
},
13273-
{
13274-
"$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsResolvers"
13275-
},
13276-
{
13277-
"$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsResolvers_inboundEndpoints"
13278-
},
13279-
{
13280-
"$ref": "https://schema.management.azure.com/schemas/2020-04-01-preview/Microsoft.Network.json#/resourceDefinitions/dnsResolvers_outboundEndpoints"
13281-
},
1328213264
{
1328313265
"$ref": "https://schema.management.azure.com/schemas/2015-05-01-preview/Microsoft.Network.NRP.json#/resourceDefinitions/applicationGateways"
1328413266
},

0 commit comments

Comments
 (0)