Skip to content

Commit 4bd2960

Browse files
author
Manika Dhiman
committed
resolved merge conflict
2 parents 745030c + 7003c29 commit 4bd2960

File tree

93 files changed

+134
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+134
-135
lines changed

‎azure-local/assurance/azure-stack-fedramp-guidance.md

Lines changed: 1 addition & 1 deletion

‎azure-local/assurance/azure-stack-hipaa-guidance.md

Lines changed: 1 addition & 1 deletion

‎azure-local/assurance/azure-stack-iso27001-guidance.md

Lines changed: 1 addition & 1 deletion

‎azure-local/assurance/azure-stack-pci-dss-guidance.md

Lines changed: 1 addition & 1 deletion

‎azure-local/assurance/azure-stack-security-standards.md

Lines changed: 1 addition & 1 deletion

‎azure-local/concepts/azure-hybrid-benefit.md

Lines changed: 1 addition & 1 deletion

‎azure-local/concepts/billing.md

Lines changed: 1 addition & 1 deletion

‎azure-local/concepts/cache.md

Lines changed: 1 addition & 1 deletion

‎azure-local/concepts/choose-drives.md

Lines changed: 1 addition & 1 deletion

‎azure-local/concepts/compare-windows-server.md

Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)