Merged changes with dev

Author: NehaRaje

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1

@@ -1226,7 +1226,6 @@ function Test-DisableProtection
 
 <#
 .SYNOPSIS
-<<<<<<< HEAD
 Recovery Services San E2E test
 #>
 function Test-SanE2E
@@ -1372,8 +1371,6 @@ function Test-SanE2E
 <#
 .SYNOPSIS
 Recovery Services Enable Protection Tests
-=======
->>>>>>> dev
 Wait for CanFailover state
 Usage:
 	WaitForCanFailover pcId peId

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/CreateAzureSiteRecoveryProtectionProfileObject.cs

@@ -152,7 +152,6 @@ public class CreateAzureSiteRecoveryProtectionProfileObject : RecoveryServicesCm
         public SwitchParameter AllowReplicaDeletion { get; set; }
 
         /// <summary>
-<<<<<<< HEAD
         /// Gets or sets the primary cloud id of the Protection Profile.
         /// </summary>
         [Parameter(ParameterSetName = ASRParameterSets.EnterpriseToEnterpriseSan)]
@@ -181,8 +180,6 @@ public class CreateAzureSiteRecoveryProtectionProfileObject : RecoveryServicesCm
         public string RecoveryArrayId { get; set; }
 
         /// <summary>
-=======
->>>>>>> dev
         /// Gets or sets switch parameter. On passing, command does not ask for confirmation.
         /// </summary>
         [Parameter(Mandatory = false)]
@@ -267,25 +264,6 @@ private void EnterpriseToAzureProtectionProfileObject()
             {
                 this.WriteWarning(string.Format(Properties.Resources.StorageIsNotInTheSameLocationAsVault));
             }
-<<<<<<< HEAD
-
-            if (!validationSuccessful || !locationValid)
-            {
-                this.ConfirmAction(
-                    this.Force.IsPresent,
-                    string.Format(Properties.Resources.ValidationUnsuccessfulWarning, this.targetName),
-                    string.Format(Properties.Resources.NewProtectionProfileObjectWhatIfMessage),
-                    this.targetName,
-                    new Action(this.ProceedToCreateProtectionProfileObject));
-            }
-            else
-            {
-                this.ProceedToCreateProtectionProfileObject();
-            }
-        }
-
-=======
-
             if (!validationSuccessful || !locationValid)
             {
                 this.ConfirmAction(
@@ -301,7 +279,6 @@ private void EnterpriseToAzureProtectionProfileObject()
             }
         }
 
->>>>>>> dev
         /// <summary>
         /// Proceeds to Create an E2A Protection Profile Object after all the validations are done.
         /// </summary>

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/SetAzureSiteRecoveryProtectionEntity.cs

@@ -61,12 +61,9 @@ public class SetAzureSiteRecoveryProtectionEntity : RecoveryServicesCmdletBase
         /// Gets or sets Protection Entity Object.
         /// </summary>
         [Parameter(ParameterSetName = ASRParameterSets.ByPEObject, Mandatory = true, ValueFromPipeline = true)]
-<<<<<<< HEAD
         [Parameter(ParameterSetName = ASRParameterSets.ByPEObjectE2AEnable, Mandatory = true, ValueFromPipeline = true)]
         [Parameter(ParameterSetName = ASRParameterSets.EnableReplicationGroup, Mandatory = true)]
         [Parameter(ParameterSetName = ASRParameterSets.DisableReplicationGroup, Mandatory = true)]
-=======
->>>>>>> dev
         [ValidateNotNullOrEmpty]
         public ASRProtectionEntity ProtectionEntity { get; set; }