From 55b645d5e7f64af325f02b98a26dfef952e32f5d Mon Sep 17 00:00:00 2001
From: yusufkaratoprak <yusufkaratoprak@yahoo.com>
Date: Wed, 28 Apr 2021 13:06:31 +0300
Subject: [PATCH] Update azure-pipelines.yml

updated
---
 azure-pipelines.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 22031ce..55b4282 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,10 +14,7 @@ variables:
   containerRegistry: 'voloeventhub.azurecr.io'
   dockerfilePath: '**/Dockerfile'
   tag: '$(Build.BuildNumber)'
-<<<<<<< HEAD
-=======
 
->>>>>>> main
 
   # Agent VM image name
   vmImageName: 'ubuntu-latest'