From 3957151342e2680f530c59420a8a6302b83ba43a Mon Sep 17 00:00:00 2001
From: Jon Fortescue <jofortes@microsoft.com>
Date: Tue, 12 Oct 2021 13:31:52 -0700
Subject: [PATCH] Remove merge conflict

---
 .vsts-ci.yml | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 47390d2bb..2c3d7213f 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -104,17 +104,10 @@ stages:
       agentOs: Windows_NT
       pool:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
-<<<<<<< HEAD
           name: NetCore1ESPool-Public
           demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           name: NetCore1ESPool-Internal
-=======
-          name: NetCore1ESPool-Svc-Public
-          demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
-        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          name: NetCore1ESPool-Svc-Internal
->>>>>>> main
           demands: ImageOverride -equals build.windows.10.amd64.vs2019
       timeoutInMinutes: 180
       strategy:
@@ -140,17 +133,10 @@ stages:
       agentOs: Linux
       pool:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
-<<<<<<< HEAD
           name: NetCore1ESPool-Public
           demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           name: NetCore1ESPool-Internal
-=======
-          name: NetCore1ESPool-Svc-Public
-          demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
-        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          name: NetCore1ESPool-Svc-Internal
->>>>>>> main
           demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
       timeoutInMinutes: 180
       strategy:
@@ -312,17 +298,10 @@ stages:
       agentOs: Linux
       pool:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
-<<<<<<< HEAD
           name: NetCore1ESPool-Public
           demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           name: NetCore1ESPool-Internal
-=======
-          name: NetCore1ESPool-Svc-Public
-          demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open
-        ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-          name: NetCore1ESPool-Svc-Internal
->>>>>>> main
           demands: ImageOverride -equals Build.Ubuntu.1604.Amd64
       timeoutInMinutes: 180
       strategy: