From f3db30cbdfc3f57a72a95d5daa3cd48d04e7aaae Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Mon, 6 Nov 2023 09:54:39 +0100
Subject: [PATCH] Apply suggestions from code review

---
 dev-tools/packaging/templates/ironbank/Dockerfile.tmpl       | 5 -----
 .../templates/ironbank/hardening_manifest.yaml.tmpl          | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/dev-tools/packaging/templates/ironbank/Dockerfile.tmpl b/dev-tools/packaging/templates/ironbank/Dockerfile.tmpl
index 49471cbfaa3..8d4c4aa9990 100644
--- a/dev-tools/packaging/templates/ironbank/Dockerfile.tmpl
+++ b/dev-tools/packaging/templates/ironbank/Dockerfile.tmpl
@@ -3,13 +3,8 @@
 # Extract Elastic Agent and make various file manipulations.
 ################################################################################
 ARG BASE_REGISTRY=registry1.dsop.io
-<<<<<<< HEAD
-ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.8
-=======
 ARG BASE_IMAGE=redhat/ubi/ubi9
 ARG BASE_TAG=9.2
->>>>>>> a956f6436a (ironbank: move to ubi9 (#3691))
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files
 
diff --git a/dev-tools/packaging/templates/ironbank/hardening_manifest.yaml.tmpl b/dev-tools/packaging/templates/ironbank/hardening_manifest.yaml.tmpl
index 7639afa51a7..e0b1e0d80c7 100644
--- a/dev-tools/packaging/templates/ironbank/hardening_manifest.yaml.tmpl
+++ b/dev-tools/packaging/templates/ironbank/hardening_manifest.yaml.tmpl
@@ -13,13 +13,8 @@ tags:
 
 # Build args passed to Dockerfile ARGs
 args:
-<<<<<<< HEAD
-  BASE_IMAGE: "redhat/ubi/ubi8"
-  BASE_TAG: "8.8"
-=======
   BASE_IMAGE: "redhat/ubi/ubi9"
   BASE_TAG: "9.2"
->>>>>>> a956f6436a (ironbank: move to ubi9 (#3691))
   ELASTIC_STACK: "{{ beat_version }}"
   ELASTIC_PRODUCT: "elastic-agent"