Skip to content

Commit 10a2937

Browse files
MikeWeiner-MicrosoftMikeWeiner-Microsoft
authored andcommitted
sync from main
1 parent 66e7f92 commit 10a2937

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

articles/event-grid/handle-health-resources-events-using-azure-monitor-alerts.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,7 @@ The event filter enables users to receive alerts for a specific resource group,
7979

8080
### Sample ResourceAnnotated event
8181

82-
<<<<<<< HEAD
83-
Here's a sample `Microsoft.ResourceNotifications.HealthResources.ResourceAnnotated` event:
84-
=======
8582
Here's a sample `ResourceAnnotated` event. Notice that the `type` is set to `Microsoft.ResourceNotifications.HealthResources.ResourceAnnotated`.
86-
>>>>>>> 3c6ef7ea55d8faa5800374b18c6919bddaa9c845
8783

8884
```json
8985
{
@@ -120,11 +116,7 @@ Here's a sample `ResourceAnnotated` event. Notice that the `type` is set to `Mic
120116

121117
### Sample AvailabilityStatusChanged event
122118

123-
<<<<<<< HEAD
124-
Here's a sample `Microsoft.ResourceNotifications.HealthResources.AvailabilityStatusChanged` event:
125-
=======
126119
Here's a sample `AvailabilityStatusChanged` event. Notice that the `type` is set to `Microsoft.ResourceNotifications.HealthResources.AvailabilityStatusChanged`.
127-
>>>>>>> 3c6ef7ea55d8faa5800374b18c6919bddaa9c845
128120

129121
```json
130122
{

0 commit comments

Comments
 (0)