Fix merge conflict

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

No files matched your search

-1
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 \