resolved conflicts

elastic · Dec 12, 2024 · 9a0ced1 · 9a0ced1
1 parent 04cf241
commit 9a0ced1
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.buildkite/bk.integration.pipeline.yml b/.buildkite/bk.integration.pipeline.yml
@@ -97,10 +97,7 @@ steps:
           - fleet-airgapped-privileged
 
       - label: "arm:sudo: {{matrix}}"
-<<<<<<< HEAD
-=======
         # https://github.com/elastic/ingest-dev/issues/4610
->>>>>>> 6eb9290c35 (Skip new ARM tests: https://github.com/elastic/ingest-dev/issues/4610 (#6173))
         skip: true
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'package-it' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
@@ -124,10 +121,7 @@ steps:
           - fleet-airgapped-privileged
 
       - label: "arm:non-sudo: {{matrix}}"
-<<<<<<< HEAD
-=======
         # https://github.com/elastic/ingest-dev/issues/4610
->>>>>>> 6eb9290c35 (Skip new ARM tests: https://github.com/elastic/ingest-dev/issues/4610 (#6173))
         skip: true
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'package-it' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}