Update hardening_manifest.yaml

elastic · Oct 9, 2023 · c171b61 · c171b61
1 parent da4d429
commit c171b61
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml b/dev-tools/packaging/templates/ironbank/packetbeat/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: "packetbeat"