mirror of
https://github.com/v2fly/v2ray-core.git
synced 2025-01-02 23:47:07 -05:00
fix azure-pipelines bad merge
This commit is contained in:
parent
200e6ea3dc
commit
2d934d1027
@ -54,13 +54,7 @@ jobs:
|
|||||||
timeoutInMinutes: 60
|
timeoutInMinutes: 60
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
<<<<<<< HEAD
|
|
||||||
vmImage: 'Ubuntu 16.04'
|
|
||||||
|
|
||||||
=======
|
|
||||||
vmImage: 'ubuntu-latest'
|
vmImage: 'ubuntu-latest'
|
||||||
|
|
||||||
>>>>>>> f099c1e5... Update azure-pipelines.yml
|
|
||||||
variables:
|
variables:
|
||||||
- group: GithubToken
|
- group: GithubToken
|
||||||
- name: GOPATH
|
- name: GOPATH
|
||||||
|
Loading…
Reference in New Issue
Block a user