From 3a8e1cc4492326f4b93a989912147721e4083f48 Mon Sep 17 00:00:00 2001
From: Julien Lind <julien.lind@elastic.co>
Date: Mon, 9 Oct 2023 16:00:03 +0200
Subject: [PATCH] Update hardening_manifest.yaml

---
 .../templates/ironbank/auditbeat/hardening_manifest.yaml      | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
index ffcb8729d884..6898aee9ba6d 100644
--- a/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
+++ b/dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
@@ -13,11 +13,7 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
-<<<<<<< HEAD
-  BASE_TAG: "8.7"
-=======
   BASE_TAG: "9.2"
->>>>>>> 239357688c (change base image to ubi 9.2 (#36797))
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "auditbeat"