fix azure-pipelines bad merge

This commit is contained in:
Kslr
2020-05-31 12:28:34 +08:00
parent 200e6ea3dc
commit 2d934d1027
-6
View File
@@ -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