Update azure-pipelines.yml

updated
6 years ago · 55b645d5e7
1 changed files with 0 additions and 3 deletions
--- 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'