edits

Author: tejaswikolli-web

articles/container-registry/container-registry-artifact-streaming.md

@@ -3,19 +3,12 @@ title: "Artifact streaming in Azure Container Registry (Preview)"
 description: "Artifact streaming is a feature in Azure Container Registry to enhance and supercharge managing, scaling, and deploying artifacts through containerized platforms."
 author: tejaswikolli-web
 ms.service: container-registry
-<<<<<<< HEAD
 zone_pivot_groups: container-registry-zones
 ms.topic: conceptual #Don't change
 ms.date: 02/26/2024
 ai-usage: ai-assisted
 
 #customer intent: As a developer, I want artifact streaming capabilities so that I can efficiently deliver and serve containerized applications to end-users in real-time.
-=======
-ms.custom: devx-track-azurecli
-ms.topic: conceptual #Don't change
-ms.date: 12/14/2023
-# Customer intent: As a developer, I want artifact streaming capabilities so that I can efficiently deliver and serve containerized applications to end-users in real-time.
->>>>>>> 03459ecf39b88721d065285326c4ec3659d8b17d
 ---
 
 # Artifact streaming in Azure Container Registry (Preview)