remove merge artifact

hashicorp · Jan 10, 2025 · 0740d46 · 0740d46
1 parent ea036eb
commit 0740d46
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/website/content/docs/concepts/events.mdx b/website/content/docs/concepts/events.mdx
@@ -148,7 +148,6 @@ clusters.
 
 </Note>
 
->>>>>>> b31788d055 (update docs for eventing (#28950))
 Vault has an API endpoint, `/v1/sys/events/subscribe/{eventType}`, that allows users to subscribe to event notifications via a
 WebSocket stream.
 This endpoint supports the standard authentication and authorization workflows used by other Vault endpoints.