bad merge

scbedd · scbedd · commit a507634d39ba · 2024-02-15T17:49:57.000-08:00
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -82,10 +82,6 @@ parameters:
   - name: AdvancedBuild
     type: boolean
     default: false
-<<<<<<< HEAD
-
-=======
->>>>>>> 1e2595ffad (Support dynamic+hardcode matrix pool hybrid)
 
 extends:
   ${{ if eq(variables['System.TeamProject'], 'internal') }}:
