Merge pull request #38 from volosoft/dev

Dev
6 years ago · e50c2f694e
1 changed files with 3 additions and 0 deletions
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -14,7 +14,10 @@ variables:
  containerRegistry: 'voloeventhub.azurecr.io'
  dockerfilePath: '**/Dockerfile'
  tag: '$(Build.BuildNumber)'
+<<<<<<< HEAD
+=======

+>>>>>>> main

  # Agent VM image name
  vmImageName: 'ubuntu-latest'