Deleted conflicting merge files

Signed-off-by: Hans Cornelis <hacornelis@gmail.com>

core/dovecot/Dockerfile_BACKUP_7007

@@ -1,19 +0,0 @@
-<<<<<<< HEAD
-FROM alpine:3.7
-=======
-FROM alpine:3.8
->>>>>>> upstream/master
-
-RUN apk add --no-cache \
-     dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client \
-     python3 py3-pip \
- && pip3 install --upgrade pip \
- && pip3 install jinja2 podop tenacity
-
-COPY conf /conf
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-VOLUME ["/data", "/mail"]
-
-CMD /start.py

core/dovecot/Dockerfile_BASE_7007

@@ -1,14 +0,0 @@
-FROM alpine:edge
-
-RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk add --no-cache \
-     dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
-     rspamd-client@testing python py-jinja2
-
-COPY conf /conf
-COPY sieve /var/lib/dovecot
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-
-CMD /start.py

core/dovecot/Dockerfile_LOCAL_7007

@@ -1,14 +0,0 @@
-FROM alpine:3.7
-
-RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk add --no-cache \
-     dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
-     rspamd-client@testing python py-jinja2
-
-COPY conf /conf
-COPY sieve /var/lib/dovecot
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-
-CMD /start.py

core/dovecot/Dockerfile_REMOTE_7007

@@ -1,15 +0,0 @@
-FROM alpine:3.8
-
-RUN apk add --no-cache \
-     dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client \
-     python3 py3-pip \
- && pip3 install --upgrade pip \
- && pip3 install jinja2 podop tenacity
-
-COPY conf /conf
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-VOLUME ["/data", "/mail"]
-
-CMD /start.py