From 0231258f53e0b17469b266c4c6333a6aeb9dd3aa Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Sat, 13 Jul 2019 03:54:05 +0300
Subject: [PATCH] Remove orphaned information about SVN

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

diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile
index aa14fddbe..51c89d85d 100644
--- a/zabbix-appliance/rhel/Dockerfile
+++ b/zabbix-appliance/rhel/Dockerfile
@@ -14,12 +14,7 @@ ARG VCS_REF
 ARG MAJOR_VERSION=4.0
 ARG RELEASE=0
 ARG ZBX_VERSION=${MAJOR_VERSION}.${RELEASE}
-
-<<<<<<< HEAD
-ARG ZBX_SOURCES=svn://svn.zabbix.com/trunk/
-=======
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
->>>>>>> master
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
 
 LABEL name="zabbix/zabbix-appliance" \