From 66130fe5ac3f5c7c84a080da7e645a2db24f3a86 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 18 Oct 2021 17:49:37 +0300
Subject: [PATCH] Fixed tag generation for releases

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

diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml
index d40dc5893..fed3d41d1 100644
--- a/.github/workflows/images_build.yml
+++ b/.github/workflows/images_build.yml
@@ -12,12 +12,8 @@ on:
       - 'trunk'
     paths:
       - 'Dockerfiles/**'
-<<<<<<< HEAD
       - '!**/README.md'
       - '!Dockerfiles/*/rhel/*'
-=======
-      - '!Dockerfiles/*/rhel/**'
->>>>>>> f6ec3dbb5e7ef76c4568ad27621adfb907330bee
       - '!Dockerfiles/*/windows/*'
       - '.github/workflows/images_build.yml'