Fix merge conflict

This commit is contained in:
Michael Kuron
2017-07-05 20:11:07 +02:00
parent b88190988e
commit 8946d69274
3 changed files with 2 additions and 7 deletions

View File

@@ -8,7 +8,6 @@ ENV GOSU_VERSION 1.9
# Prerequisites
RUN apt-get update && apt-get install -y --no-install-recommends \
apt-transport-https \
bind9-host \
ca-certificates \
cron \
gnupg \