From 43fb76ac62dccf63b609fd25935743b17172db82 Mon Sep 17 00:00:00 2001
From: Kslr <kslrwang@gmail.com>
Date: Sat, 28 Mar 2020 02:11:35 +0800
Subject: [PATCH] Update azure-pipelines.yml

---
 azure-pipelines.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 798e1d63..4fff8abe 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -42,7 +42,7 @@ jobs:
   - checkout: self
   - task: GoTool@0
     inputs:
-      version: '1.14.3'
+      version: '1.14.x'
   - script: |
       bash ./testing/coverage/coverall
     workingDirectory: '$(Build.SourcesDirectory)'
@@ -54,8 +54,13 @@ jobs:
   timeoutInMinutes: 60
 
   pool:
+<<<<<<< HEAD
     vmImage: 'Ubuntu 16.04'
 
+=======
+    vmImage: 'ubuntu-latest'
+  
+>>>>>>> f099c1e5... Update azure-pipelines.yml
   variables:
     - group: GithubToken
     - name: GOPATH
@@ -67,7 +72,7 @@ jobs:
   - checkout: self
   - task: GoTool@0
     inputs:
-      version: '1.14.3'
+      version: '1.14.x'
   - script: |
       mkdir triggersrc
       ls -I "triggersrc" | xargs cp -rf -t triggersrc