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

---
 .ci/Jenkinsfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index 07bf19d7bf1..68819a39599 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -110,13 +110,9 @@ pipeline {
               }
             }
             steps {
-<<<<<<< HEAD
-              runK8s(k8sVersion: 'v1.26.0', kindVersion: 'v0.17.0', context: "K8s-${PLATFORM}")
-=======
               deleteDir()
               unstashV2(name: 'source', bucket: "${JOB_GCS_BUCKET}", credentialsId: "${JOB_GCS_CREDENTIALS}")
               runK8s(k8sVersion: 'v1.27.3', kindVersion: 'v0.20.0', context: "K8s-${PLATFORM}")
->>>>>>> bf78cc1e14 ([CI] Pull requests migration to buildkite (#3573))
             }
           }
           stage('Package') {