Fixing merge conflicts

Azure · Apr 14, 2022 · 84debaa · 84debaa
2 parents effd029 + e702b91
commit 84debaa
Show file tree

Hide file tree

Showing 7 changed files with 620 additions and 428 deletions.
diff --git a/...Tests/TestVMWithSettingWindowsConfigurationPatchSettingsAssessmentModeOfImageDefault.json b/...Tests/TestVMWithSettingWindowsConfigurationPatchSettingsAssessmentModeOfImageDefault.json
diff --git a/...hSettingTests/TestVMWithSettingWindowsConfigurationPatchSettingsValueOfAutomaticByOS.json b/...hSettingTests/TestVMWithSettingWindowsConfigurationPatchSettingsValueOfAutomaticByOS.json
diff --git a/...utoPatchSettingTests/TestVMWithSettingWindowsConfigurationPatchSettingsValueOfManual.json b/...utoPatchSettingTests/TestVMWithSettingWindowsConfigurationPatchSettingsValueOfManual.json
diff --git a/...gTests/TestVMWithSettingWindowsConfigurationPatchSettingsValuesOfAutomaticByPlatform.json b/...gTests/TestVMWithSettingWindowsConfigurationPatchSettingsValuesOfAutomaticByPlatform.json
diff --git a/...essionRecords/VMScaleSetRollingUpgradeTests/TestVMScaleSetAutomaticOSUpgradePolicies.json b/...essionRecords/VMScaleSetRollingUpgradeTests/TestVMScaleSetAutomaticOSUpgradePolicies.json
diff --git a/...ests/SessionRecords/VMScaleSetRollingUpgradeTests/TestVMScaleSetExtensionUpgradeAPIs.json b/...ests/SessionRecords/VMScaleSetRollingUpgradeTests/TestVMScaleSetExtensionUpgradeAPIs.json
diff --git a/...sts/SessionRecords/VMScaleSetRollingUpgradeTests/TestVMScaleSetRollingUpgradeHistory.json b/...sts/SessionRecords/VMScaleSetRollingUpgradeTests/TestVMScaleSetRollingUpgradeHistory.json