From 6372dbd585e70a475d4e86ae99615c8de2a63e28 Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Tue, 7 Nov 2023 12:15:48 +0100
Subject: [PATCH] fixed conflicts

---
 .buildkite/pipeline.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 8c1e2f245e3..cbc5da2408b 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -4,8 +4,6 @@ env:
   VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
   DOCKER_REGISTRY: "docker.elastic.co"
 steps:
-<<<<<<< HEAD
-=======
   - label: "Unit tests - Ubuntu 22.04"
     key: "unit-tests-2204"
     command: ".buildkite/scripts/steps/unit-tests.sh"
@@ -148,7 +146,6 @@ steps:
       provider: "gcp"
       machineType: "n1-standard-8"
 
->>>>>>> bf78cc1e14 ([CI] Pull requests migration to buildkite (#3573))
   - label: "Integration tests"
     key: "integration-tests"
     command: ".buildkite/scripts/steps/integration_tests.sh"