merge conflict

Author: MahendraAgrawal

rds-deployment-existing-ad/azuredeploy.json

@@ -57,11 +57,7 @@
     }
   },
     "variables": {
-<<<<<<< HEAD
         "dnsLabelPrefix": "[concat('rdsdns', resourceGroup().name)]",
-=======
-        "dnsLabelPrefix": "[concat('dns', resourceGroup().name)]",
->>>>>>> b094f9e518966b6cca3b5654ee0b5a6c73d644ab
         "gwdnsLabelPrefix": "[concat('gw', resourceGroup().name)]",
         "cbdnsLabelPrefix": "[concat('cb', resourceGroup().name)]",
         "rdshVmSize": "Standard_A2",
@@ -70,13 +66,8 @@
         "uniqueStorageAccountContainerName": "[concat('sc', resourceGroup().name)]",
         "imagePublisher": "MicrosoftWindowsServer",
         "imageOffer": "WindowsServer",
-<<<<<<< HEAD
         "vnetAddressRange": "10.0.0.0/16",
         "subnetAddressRange": "10.0.0.0/24",
-=======
-        "adVnetName": "[concat('ADVNET',resourceGroup().name)]",
-        "adSubnetName": "[concat('ADStaticSubnet',resourceGroup().name)]",
->>>>>>> b094f9e518966b6cca3b5654ee0b5a6c73d644ab
         "dnsServerPrivateIp": "10.0.0.4",
         "subnet-id": "[concat(resourceId('Microsoft.Network/virtualNetworks',parameters('adVnetName')),'/subnets/',parameters('adSubnetName'))]",
         "publicIpRef": "publicIp",