mirror of https://github.com/v2ray/v2ray-core
fix azure-pipelines bad merge
parent
200e6ea3dc
commit
2d934d1027
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue