From b95814444d91ed57bc272c642ba12988cad004bd Mon Sep 17 00:00:00 2001
From: Andre Zoledziowski <az@zok.xyz>
Date: Sat, 13 Oct 2018 14:37:55 +0200
Subject: [PATCH] commit after pressing save...

---
 core/Dockerfile   |  6 ------
 webapp/Dockerfile | 15 ---------------
 2 files changed, 21 deletions(-)

diff --git a/core/Dockerfile b/core/Dockerfile
index bf9d177..471834e 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -43,7 +43,6 @@ COPY --from=common /common.sh /kopano/helper/
 SHELL [ "/bin/bash", "-c"]
 
 RUN \
-<<<<<<< HEAD
     # community download and package as apt source repository
     . /kopano/helper/common.sh && \
     if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
@@ -58,11 +57,6 @@ RUN \
     if [ ${RELEASE_KEY_DOWNLOAD} -eq 1 ]; then \
         curl -s -S -o - "${KOPANO_CORE_REPOSITORY_URL}/Release.key" | apt-key add -; \
     fi; \
-=======
-    # community download
-    [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ] && \
-    /kopano/download_community.sh core; \
->>>>>>> e6766f261f54d575dbef21af400319f27583d5c0
     # install
     apt-get update && \
     set -x && \
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index f6dad85..b9ca21f 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -42,7 +42,6 @@ SHELL [ "/bin/bash", "-c"]
 
 # install kopano web app and refresh ca-certificates
 RUN \
-<<<<<<< HEAD
     # community download and package as apt source repository
     . /kopano/helper/common.sh && \
     if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
@@ -62,20 +61,6 @@ RUN \
         curl -s -S -o - "${KOPANO_WEBAPP_REPOSITORY_URL}/Release.key" | apt-key add -; \
     fi; \
     # prepare z-push installation
-=======
-    # community download
-    [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ] && \
-    /kopano/download_community.sh core && \
-    /kopano/download_community.sh webapp; \
-    # install
-    set -x && \
-    echo ${KOPANO_CORE_VERSION} > /kopano/buildversion && \
-    echo ${KOPANO_WEBAPP_VERSION} >> /kopano/buildversion && \
-    echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_CORE_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano-core.list; \
-    [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 0 ] && echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_WEBAPP_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano-webapp.list; \
-    [ ${RELEASE_KEY_DOWNLOAD} -eq 1 ] && curl -s -S -o - "${KOPANO_CORE_REPOSITORY_URL}/Release.key" | apt-key add -; \
-    [ ${RELEASE_KEY_DOWNLOAD} -eq 1 ] && curl -s -S -o - "${KOPANO_WEBAPP_REPOSITORY_URL}/Release.key" | apt-key add -; \
->>>>>>> e6766f261f54d575dbef21af400319f27583d5c0
     echo "deb http://repo.z-hub.io/z-push:/final/Debian_9.0/ /" > /etc/apt/sources.list.d/zpush.list && \
     curl -s -S -o - "http://repo.z-hub.io/z-push:/final/Debian_9.0/Release.key" | apt-key add - && \
     # install