From 03ec9f54cea2c1e320a5d3d5a9330c466927e12e Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Fri, 16 Feb 2024 19:19:03 +0900
Subject: [PATCH] Updated according security and style recommendations

---
 .github/workflows/images_build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml
index 967e3772d..0176542b3 100644
--- a/.github/workflows/images_build.yml
+++ b/.github/workflows/images_build.yml
@@ -710,7 +710,6 @@ jobs:
             objects.githubusercontent.com:443
             tuf-repo-cdn.sigstore.dev:443
             rekor.sigstore.dev:443
->>>>>>> 05d38ba67 (Merge pull request #1188 from zabbix/merge_6.0)
 
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1