From 43c95454a3a325f251c40e2f80f406b05516d1dd Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 13 Sep 2021 18:06:34 +0200
Subject: [PATCH] Optimized Java Gateway build process. Removed unsupported
 Appliance images

---
 zabbix-appliance/rhel/Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile
index 33e23dc9e..15e7a20be 100644
--- a/zabbix-appliance/rhel/Dockerfile
+++ b/zabbix-appliance/rhel/Dockerfile
@@ -171,10 +171,7 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr
     cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \
     rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \
     mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \
-<<<<<<< HEAD
     cp -R /tmp/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
-=======
->>>>>>> master
     cd /tmp/ && \
     rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
     rm -f /usr/share/zabbix/conf/zabbix.conf.php && \