Install bzr on builder vm

BBVA · Feb 27, 2019 · b5e9b89 · b5e9b89
1 parent bc4b031
commit b5e9b89
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,10 +26,7 @@ steps:
     mv !(gopath) '$(modulePath)'
     echo '##vso[task.prependpath]$(GOBIN)'
     echo '##vso[task.prependpath]$(GOROOT)/bin'
-<<<<<<< HEAD
     sudo apt install bzr
-=======
->>>>>>> QED Azure pipeline
   displayName: 'Set up the Go workspace'
 
 - script: |
@@ -46,7 +43,4 @@ steps:
     go vet -composites=false ./...
   workingDirectory: '$(modulePath)'
   displayName: 'Get dependencies, then build'
-<<<<<<< HEAD
 
-=======
->>>>>>> QED Azure pipeline