fix azure-pipelines bad merge

5 years ago · 2d934d1027
parent 200e6ea3dc
commit 2d934d1027
1 changed files with 0 additions and 6 deletions
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -54,13 +54,7 @@ jobs:
  timeoutInMinutes: 60

  pool:
-<<<<<<< HEAD
-    vmImage: 'Ubuntu 16.04'
-
-=======
    vmImage: 'ubuntu-latest'
-  
->>>>>>> f099c1e5... Update azure-pipelines.yml
  variables:
    - group: GithubToken
    - name: GOPATH