Skip to content

Commit

Permalink
now solved conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
giacomo committed Mar 15, 2021
1 parent 7cba2a8 commit 42e17e3
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ FROM alpine:3.12
LABEL maintainer "Unified Streaming <[email protected]>"

# Install packages
<<<<<<< HEAD
RUN apk --update add apache2 apache2-proxy apache2-ssl python3 py3-pip \
=======
RUN apk --update add apache2 apache2-proxy apache2-ssl \
>>>>>>> master
&& rm -f /var/cache/apk/*

RUN wget -q -O /etc/apk/keys/[email protected] \
Expand Down

0 comments on commit 42e17e3

Please sign in to comment.