merge issues

Author: pragrawa

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs

@@ -57,11 +57,7 @@ public override void ExecuteCmdlet()
                 queryFilterString = ConstructQueryFilterString();
                 var containerList = AzureBackupClient.ListContainers(queryFilterString);
 
-<<<<<<< HEAD
                 WriteDebug(string.Format("Fetched {0} containers", containerList.Count()));
-=======
-                WriteDebug(string.Format("# of fetched containers = {0}", listContainerResponse.Objects.Count));
->>>>>>> dev
 
                 List<ContainerInfo> containerInfos = containerList.ToList();
 
@@ -76,13 +72,10 @@ public override void ExecuteCmdlet()
                     WriteDebug(string.Format("# of containers after resource group filter = {0}", containerInfos.Count));
                 }
 
-<<<<<<< HEAD
                 WriteDebug(string.Format("Count of containers after resource group filter = {0}", containerInfos.Count));
 
                 // TODO: Container friendly name is not captures in Container response
                 // BUG: Friendly name was previously assigned to ResourceName (vault name)
-=======
->>>>>>> dev
                 List<AzureBackupContainer> containers = containerInfos.ConvertAll(containerInfo =>
                 {
                     return new AzureBackupContainer(vault, containerInfo);

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/SetAzureBackupVaultStorageType.cs

@@ -41,24 +41,8 @@ public override void ExecuteCmdlet()
                     throw new ArgumentException("Invalid storage type.");
                 }
 
-<<<<<<< HEAD
                 WriteVerbose(String.Format("Updating the storage type. Type:{0}", Type));
                 AzureBackupClient.UpdateStorageType(Type.ToString());
-=======
-                WriteDebug("Updating the storage type.");
-
-                UpdateVaultStorageTypeRequest updateVaultStorageTypeRequest = new UpdateVaultStorageTypeRequest()
-                {
-                    StorageTypeProperties = new StorageTypeProperties()
-                    {
-                        StorageModelType = Type.ToString(),
-                    },
-                };
-
-                AzureBackupClient.Vault.UpdateStorageTypeAsync(updateVaultStorageTypeRequest, GetCustomRequestHeaders(), CmdletCancellationToken).Wait();
-
-                WriteDebug("Update successful.");
->>>>>>> dev
             });
         }
     }