From 2d934d1027d29c00a827646295e0c1b668840907 Mon Sep 17 00:00:00 2001
From: Kslr <hi@kslr.org>
Date: Sun, 31 May 2020 12:28:34 +0800
Subject: [PATCH] fix azure-pipelines bad merge

---
 azure-pipelines.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4fff8abe6..2901e3145 100644
--- 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