Skip to content

Commit aa47a19

Browse files
committed
Resolve merge conflict in network-security-perimeter-transition.md by keeping latest ms.date
2 parents da5c861 + c2a3f83 commit aa47a19

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

articles/private-link/network-security-perimeter-transition.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ author: mbender-ms
66
ms.author: mbender
77
ms.service: azure-private-link
88
ms.topic: overview
9+
# Resolved conflict: keep the newer ms.date
910
ms.date: 08/01/2025
1011
#CustomerIntent: As a network administrator, I want to understand the different access modes and how to transition to a network security perimeter in Azure.
1112
# Customer intent: As a network administrator, I want to learn how to configure access modes and transition to a network security perimeter in Azure, so that I can secure my resources while minimizing connectivity disruptions.

includes/network-security-perimeter-preview-message.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ ms.custom: include file, ignite-2024
1111
---
1212

1313
> [!IMPORTANT]
14-
> Network security perimeter is now generally available in all Azure public cloud regions. For information on supported services, see [Onboarded private link resources](/azure/private-link/network-security-perimeter-concepts.md#onboarded-private-link-resources) for supported PaaS services."
14+
> Network security perimeter is now generally available in all Azure public cloud regions. For information on supported services, see [Onboarded private link resources](/azure/private-link/network-security-perimeter-concepts#onboarded-private-link-resources) for supported PaaS services."

0 commit comments

Comments
 (0)